Sort variables alphabetically (#1154)

SleipnirGroup · Jan 22, 2025 · d284680 · d284680
1 parent 49f7130
commit d284680
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/components/config/variables/PoseVariablesConfigPanel.tsx b/src/components/config/variables/PoseVariablesConfigPanel.tsx
@@ -132,7 +132,7 @@ const PoseVariablesConfigPanel = observer(() => {
   doc.variables.poses.keys();
   return (
     <>
-      {Array.from(doc.variables.poses.entries()).map((entry) => (
+      {doc.variables.sortedPoses.map((entry) => (
         <OpenablePoseVariablePanel
           entry={entry}
           setName={(name) => doc.variables.renamePose(entry[0], name)}

diff --git a/src/components/config/variables/VariablesConfigPanel.tsx b/src/components/config/variables/VariablesConfigPanel.tsx
@@ -147,7 +147,7 @@ const VariablesConfigPanel = observer(() => {
   doc.variables.expressions.keys();
   return (
     <>
-      {Array.from(doc.variables.expressions.entries()).map((entry) => (
+      {doc.variables.sortedExpressions.map((entry) => (
         <VariablePanel
           validateName={(name) => doc.variables.validateName(name, entry[0])}
           logo={() => (

diff --git a/src/document/ExpressionStore.tsx b/src/document/ExpressionStore.tsx
@@ -597,6 +597,22 @@ export const Variables = types
         vars.set(key, val.asScope);
       }
       return vars;
+    },
+    get sortedExpressions(): Array<[string, IExpressionStore]> {
+      return Array.from(self.expressions.entries()).sort((a, b) =>
+        a[0].toLocaleUpperCase() > b[0].toLocaleUpperCase() ? 1 : -1
+      );
+    },
+    get sortedExpressionKeys(): Array<string> {
+      return this.sortedExpressions.map(([key, _]) => key);
+    },
+    get sortedPoses(): Array<[string, IExprPose]> {
+      return Array.from(self.poses.entries()).sort((a, b) =>
+        a[0].toLocaleUpperCase() > b[0].toLocaleUpperCase() ? 1 : -1
+      );
+    },
+    get sortedPoseKeys(): Array<string> {
+      return this.sortedPoses.map(([key, _]) => key);
     }
   }))
   .actions((self) => ({