From 83374615aabaa322d27e02f56b679f152afe69ac Mon Sep 17 00:00:00 2001
From: Thomas <dev.csnova@gmail.com>
Date: Sat, 9 Apr 2022 18:41:57 -0500
Subject: [PATCH 1/4] fixed positioning of textbox

---
 src/components/TextBox.vue | 29 +++++++++++++++++++++--------
 src/pages/Editor.vue       | 17 +++++++++--------
 src/types.ts               |  9 +++++++++
 3 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/components/TextBox.vue b/src/components/TextBox.vue
index 7d7a2d9..4a7dce5 100644
--- a/src/components/TextBox.vue
+++ b/src/components/TextBox.vue
@@ -1,27 +1,40 @@
 <script setup lang="ts">
 import { ref } from "vue";
+import { RichTextBox } from "../types.ts";
 
 const props = defineProps({
-  statement: { type: String, required: true },
-  })
+  value: {
+    type: RichTextBox,
+  },
+  // statement: { type: String, required: true },
+  // startingX:  { type: Number, default: 0 },
+  // startingY:  { type: Number, default: 0 },
+});
 </script>
 
 <template>
-  <Draggable :grid="[25, 25]">
-    <div style="display: flex">
+  <Draggable
+    :grid="[5, 5]"
+    :default-position="{ x: props.value.x, y: props.value.y }"
+  >
+    <div style="display: flex; bottom: 10px; right: 0">
       <q-card flat bordered>
-        <q-card-section style="padding:0">
+        <q-card-section style="padding: 0">
           <div class="row items-center no-wrap">
-            <q-card-section v-html="props.statement" />
+            <q-card-section v-html="props.value.text" />
             <div class="col-auto">
               <q-btn color="grey-7" round flat icon="more_vert">
                 <q-menu cover auto-close>
                   <q-list>
                     <q-item clickable>
-                      <q-item-section @click="() => $emit('edit')">Edit</q-item-section>
+                      <q-item-section @click="() => $emit('edit')"
+                        >Edit</q-item-section
+                      >
                     </q-item>
                     <q-item clickable>
-                      <q-item-section @click="() => $emit('remove')">Remove</q-item-section>
+                      <q-item-section @click="() => $emit('remove')"
+                        >Remove</q-item-section
+                      >
                     </q-item>
                   </q-list>
                 </q-menu>
diff --git a/src/pages/Editor.vue b/src/pages/Editor.vue
index 214d829..338141d 100644
--- a/src/pages/Editor.vue
+++ b/src/pages/Editor.vue
@@ -10,6 +10,7 @@ import Statement from '../components/Statement.vue'
 import VarDeclEditor from './VarDeclEditor.vue'
 import ExpressionEditor from './ExpressionEditor.vue'
 import TextBox from '../components/TextBox.vue'
+import {RichTextBox} from "../types.ts";
 
 const math = new MathPage(uuidv4())
 const statements = ref<MathStatement[]>([])
@@ -58,10 +59,10 @@ const saveNewExpression = (stmt: MathStatement) => {
 */
 
 const richTextStatements = ref([
-  { text: "test" },
-  { text: "test2" },
-  { text: "test3" },
-]);
+  new RichTextBox('newText'),
+  new RichTextBox('newText', 0,100)
+
+  ]);
 
 const richEditModal = ref(false);
 const richEditExpression = ref("");
@@ -110,7 +111,7 @@ function richUpdateValue() {
       <!-- drawer content -->
     </q-drawer>
 
-    <q-page-container id="editor" style="display: flex">
+    <q-page-container id="editor" >
 <!--      <WrapperBox />-->
 
       <span v-for="statement in statements">
@@ -165,12 +166,12 @@ function richUpdateValue() {
           </q-card-actions>
         </q-card>
       </q-dialog>
-      <span v-for="(item, index) in richTextStatements">
+      <div v-for="(item, index) in richTextStatements">
         <TextBox
-          :statement="item.text"
+          :value="item"
           v-on:edit="() => (item.text ? richEditStatement(index) : {})"
         ></TextBox>
-      </span>
+      </div>
     </q-page-container>
 
     <q-footer reveal elevated class="bg-grey-8 text-white">
diff --git a/src/types.ts b/src/types.ts
index c0b76d6..275eaf8 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -91,3 +91,12 @@ export interface EvaluationResult {
     variables: Record<VariableName, any>
     statements: Record<StatementID, any>
 }
+
+
+export class RichTextBox {
+    constructor(
+        public text: string = '',
+        public x: Number = 0,
+        public y: Number = 0,
+        ) {}
+}
\ No newline at end of file

From 8fbab92e1b58227cab8611a1361faa67bd67b29a Mon Sep 17 00:00:00 2001
From: Thomas <dev.csnova@gmail.com>
Date: Sat, 9 Apr 2022 18:59:28 -0500
Subject: [PATCH 2/4] fixed dragability after new statment is added

---
 src/components/TextBox.vue | 7 ++-----
 src/pages/Editor.vue       | 8 ++++++--
 src/support/const.ts       | 2 ++
 src/support/parse.ts       | 3 +++
 src/types.ts               | 4 +++-
 5 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 src/support/const.ts

diff --git a/src/components/TextBox.vue b/src/components/TextBox.vue
index 4a7dce5..74f8362 100644
--- a/src/components/TextBox.vue
+++ b/src/components/TextBox.vue
@@ -1,20 +1,17 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import { RichTextBox } from "../types.ts";
-
+import { stepX, stepY } from "../support/const.ts";
 const props = defineProps({
   value: {
     type: RichTextBox,
   },
-  // statement: { type: String, required: true },
-  // startingX:  { type: Number, default: 0 },
-  // startingY:  { type: Number, default: 0 },
 });
 </script>
 
 <template>
   <Draggable
-    :grid="[5, 5]"
+    :grid="[stepX, stepY]"
     :default-position="{ x: props.value.x, y: props.value.y }"
   >
     <div style="display: flex; bottom: 10px; right: 0">
diff --git a/src/pages/Editor.vue b/src/pages/Editor.vue
index 338141d..914c44e 100644
--- a/src/pages/Editor.vue
+++ b/src/pages/Editor.vue
@@ -11,6 +11,7 @@ import VarDeclEditor from './VarDeclEditor.vue'
 import ExpressionEditor from './ExpressionEditor.vue'
 import TextBox from '../components/TextBox.vue'
 import {RichTextBox} from "../types.ts";
+import { stepX, stepY } from "../support/const.ts";
 
 const math = new MathPage(uuidv4())
 const statements = ref<MathStatement[]>([])
@@ -114,15 +115,18 @@ function richUpdateValue() {
     <q-page-container id="editor" >
 <!--      <WrapperBox />-->
 
-      <span v-for="statement in statements">
+      <span v-for="statement in statements" style="display: flex">
         <Draggable
-            :grid="[25, 25]"
+            :grid="[stepX, stepY]"
         >
+        <div>
           <Statement
             :key="statementsKey"
             :statement="statement"
             :evaluation="evaluation"
           />
+        </div>
+
         </Draggable>
       </span>
 
diff --git a/src/support/const.ts b/src/support/const.ts
new file mode 100644
index 0000000..4d1ef7f
--- /dev/null
+++ b/src/support/const.ts
@@ -0,0 +1,2 @@
+export const stepX = 5
+export const stepY = 5
diff --git a/src/support/parse.ts b/src/support/parse.ts
index f5d96da..b9cf433 100644
--- a/src/support/parse.ts
+++ b/src/support/parse.ts
@@ -269,6 +269,9 @@ export class MathStatement {
 
         /** The raw statement input by the user. */
         public readonly raw: string,
+
+        public x: Number = 0,
+        public y: Number = 0,
     ) {}
 
     /** Parse the raw statement to an AST. */
diff --git a/src/types.ts b/src/types.ts
index 275eaf8..d459c20 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -98,5 +98,7 @@ export class RichTextBox {
         public text: string = '',
         public x: Number = 0,
         public y: Number = 0,
-        ) {}
+        ) {
+   
+    }
 }
\ No newline at end of file

From 3071947c281c5647af0b4ffb92f3774829cd3530 Mon Sep 17 00:00:00 2001
From: Thomas <dev.csnova@gmail.com>
Date: Sat, 9 Apr 2022 19:03:19 -0500
Subject: [PATCH 3/4] removed abs positioning

---
 src/components/TextBox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TextBox.vue b/src/components/TextBox.vue
index 74f8362..7b88586 100644
--- a/src/components/TextBox.vue
+++ b/src/components/TextBox.vue
@@ -14,7 +14,7 @@ const props = defineProps({
     :grid="[stepX, stepY]"
     :default-position="{ x: props.value.x, y: props.value.y }"
   >
-    <div style="display: flex; bottom: 10px; right: 0">
+    <div style="display: flex;">
       <q-card flat bordered>
         <q-card-section style="padding: 0">
           <div class="row items-center no-wrap">

From 5bcb05e0f650c581b9db400a38299498ad141845 Mon Sep 17 00:00:00 2001
From: Thomas <dev.csnova@gmail.com>
Date: Sat, 9 Apr 2022 19:08:49 -0500
Subject: [PATCH 4/4] fixed the drag issue

---
 src/components/TextBox.vue | 2 +-
 src/pages/Editor.vue       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/TextBox.vue b/src/components/TextBox.vue
index 7b88586..80216ac 100644
--- a/src/components/TextBox.vue
+++ b/src/components/TextBox.vue
@@ -14,7 +14,7 @@ const props = defineProps({
     :grid="[stepX, stepY]"
     :default-position="{ x: props.value.x, y: props.value.y }"
   >
-    <div style="display: flex;">
+    <div>
       <q-card flat bordered>
         <q-card-section style="padding: 0">
           <div class="row items-center no-wrap">
diff --git a/src/pages/Editor.vue b/src/pages/Editor.vue
index 914c44e..8a30b0d 100644
--- a/src/pages/Editor.vue
+++ b/src/pages/Editor.vue
@@ -170,11 +170,12 @@ function richUpdateValue() {
           </q-card-actions>
         </q-card>
       </q-dialog>
-      <div v-for="(item, index) in richTextStatements">
+      <div v-for="(item, index) in richTextStatements" style="display: flex">
         <TextBox
           :value="item"
           v-on:edit="() => (item.text ? richEditStatement(index) : {})"
-        ></TextBox>
+        />
+
       </div>
     </q-page-container>