Merge branch 'main' into pose-assign-waypoint

SleipnirGroup · shueja · Feb 5, 2025 · Jan 20, 2025 · Jan 20, 2025 · Jan 22, 2025
commit 87febd96b23e612d600ddb5aefdd3c328ea62882
diff --git a/src/document/ExpressionStore.tsx b/src/document/ExpressionStore.tsx
@@ -598,10 +598,21 @@ export const Variables = types
       }
       return vars;
     },
-    get sortedPoseKeys() : Array<string> {
-      return Array.from(self.poses.keys()).sort((a, b) =>
-        a.toLocaleUpperCase() > b.toLocaleUpperCase() ? 1 : -1
+    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) => ({

diff --git a/src/components/config/PoseAssignToWaypointDropdown.tsx b/src/components/config/PoseAssignToWaypointDropdown.tsx
 import { Autocomplete, createFilterOptions, MenuItem, Select, SelectChangeEvent, TextField } from "@mui/material";
 import { Component } from "react";
 import { doc } from "../../document/DocumentManager";
 import { observer } from "mobx-react";
 import { MathNode } from "mathjs";
 import { math } from "../../document/ExpressionStore";
 import Waypoint from "../../assets/Waypoint";
 type Props = {
  setXExpression: (expr: MathNode) => void;
  setHeadingExpression: (expr: MathNode) => void;
  onDefinePose: (variableName: string) => void;
  poses: readonly PoseVariableWithCustom[];
 };
 export interface PoseVariableWithCustom {
  isAdd?: boolean;
  title: string;
	import { Autocomplete, createFilterOptions, MenuItem, Select, SelectChangeEvent, TextField } from "@mui/material";
	import { Component } from "react";
	import { doc } from "../../document/DocumentManager";
	import { observer } from "mobx-react";
Check failure on line 4 in src/components/config/PoseAssignToWaypointDropdown.tsx GitHub Actions / Format `'MenuItem' is defined but never used. Allowed unused vars must match /^_/u`
	import { MathNode } from "mathjs";
Check failure on line 5 in src/components/config/PoseAssignToWaypointDropdown.tsx GitHub Actions / Format `'Select' is defined but never used. Allowed unused vars must match /^_/u`
	import { math } from "../../document/ExpressionStore";
Check failure on line 6 in src/components/config/PoseAssignToWaypointDropdown.tsx GitHub Actions / Format `'SelectChangeEvent' is defined but never used. Allowed unused vars must match /^_/u`
	import Waypoint from "../../assets/Waypoint";
	type Props = {
	setXExpression: (expr: MathNode) => void;
	setHeadingExpression: (expr: MathNode) => void;
	onDefinePose: (variableName: string) => void;
	poses: readonly PoseVariableWithCustom[];
	};
Check failure on line 14 in src/components/config/PoseAssignToWaypointDropdown.tsx GitHub Actions / Format `'Waypoint' is defined but never used. Allowed unused vars must match /^_/u`
	export interface PoseVariableWithCustom {
	isAdd?: boolean;
	title: string;