Merge branch 'main' into qi

src/components/ImageBox.vue

@@ -1,12 +1,8 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import { RichTextBox } from "../types.ts";
+import { RichTextBox } from "../support/types";
-import { stepX, stepY } from "../support/const.ts";
+import { stepX, stepY } from "../support/const";
-const props = defineProps({
+const props = defineProps<{value: RichTextBox}>();
-  value: {
-    type: RichTextBox,
-  },
-});
 </script>
 
 <template>

src/components/Statement.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {EvaluationResult, Maybe} from '../types'
+import {EvaluationResult, Maybe} from '../support/types'
 import {MathStatement} from '../support/parse'
 import {computed} from 'vue'
 import Katex from './Katex.vue'

src/components/TextBox.vue

@@ -1,12 +1,9 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import { RichTextBox } from "../types.ts";
+import { RichTextBox } from "../support/types";
-import { stepX, stepY } from "../support/const.ts";
+import { stepX, stepY } from "../support/const";
-const props = defineProps({
+const props = defineProps<{value: RichTextBox}>();
-  value: {
+
-    type: RichTextBox,
-  },
-});
 </script>
 
 <template>

src/pages/Editor.vue

@@ -101,10 +101,10 @@ const makeNewRichTextBox = () => {
   richEditID.value = richTextStatements.value.length - 1;
   richEditExpression.value = richTextStatements.value[richEditID.value].text;
   richEditModal.value = true;
-  console.log("editing statement", id, richEditModal);
+  console.log("editing statement",richEditID.value, richEditModal);
 };
 
-const richTextStatements = ref([]);
+const richTextStatements = ref([new RichTextBox("Hello World")]);
 
 const richEditModal = ref(false);
 const richEditExpression = ref("");

src/pages/ExpressionEditor.vue

@@ -3,7 +3,7 @@ import {defineEmits, ref} from 'vue'
 import {MathStatement} from '../support/parse'
 import Katex from '../components/Katex.vue'
 import { v4 as uuidv4 } from 'uuid'
-import {StatementID} from '../types'
+import {StatementID} from '../support/types'
 
 const emit = defineEmits<{
   (eventName: 'save', statement: MathStatement): void

src/pages/VarDeclEditor.vue

@@ -3,7 +3,7 @@ import {ref} from 'vue'
 import {MathStatement} from '../support/parse'
 import {v4 as uuidv4} from 'uuid'
 import Katex from '../components/Katex.vue'
-import {StatementID} from '../types'
+import {StatementID} from '../support/types'
 
 const emit = defineEmits<{
   (eventName: 'save', statement: MathStatement): void,

src/support/parse.ts

@@ -270,8 +270,8 @@ export class MathStatement {
         /** The raw statement input by the user. */
         public readonly raw: string,
 
-        public x: Number = 0,
+        public x: number = 0,
-        public y: Number = 0,
+        public y: number = 0,
     ) {}
 
     /** Parse the raw statement to an AST. */

src/support/types.ts

@@ -96,8 +96,8 @@ export interface EvaluationResult {
 export class RichTextBox {
     constructor(
         public text: string = '',
-        public x: Number = 0,
+        public x: number = 0,
-        public y: Number = 0,
+        public y: number = 0,
     ) {
 
     }