From d20746762917fd0378f731fd06e26567dde9e486 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Wed, 24 Apr 2024 18:36:52 -0400
Subject: minor tweaks for merging

---
 src/client/apis/gpt/GPT.ts                                | 6 +++---
 src/client/views/nodes/formattedText/FormattedTextBox.tsx | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/client/apis/gpt/GPT.ts b/src/client/apis/gpt/GPT.ts
index c97d29d6f..30194f9f8 100644
--- a/src/client/apis/gpt/GPT.ts
+++ b/src/client/apis/gpt/GPT.ts
@@ -43,7 +43,7 @@ const gptAPICall = async (inputText: string, callType: GPTCallType, prompt?: any
         };
         const openai = new OpenAI(configuration);
 
-        let usePrompt = prompt? opts.prompt+prompt: opts.prompt;
+        let usePrompt = prompt ? opts.prompt + prompt : opts.prompt;
         let messages: ChatCompletionMessageParam[] = [
             { role: 'system', content: usePrompt },
             { role: 'user', content: inputText },
@@ -51,9 +51,9 @@ const gptAPICall = async (inputText: string, callType: GPTCallType, prompt?: any
 
         const response = await openai.chat.completions.create({
             model: opts.model,
-            messages: messages,
-            temperature: opts.temp,
             max_tokens: opts.maxTokens,
+            temperature: opts.temp,
+            messages,
         });
         const content = response.choices[0].message.content;
         return content;
diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
index bb910737b..36c1de841 100644
--- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx
+++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
@@ -984,13 +984,10 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB
     };
 
     animateRes = (resIndex: number, newText: string) => {
-        if (!this._editorView) return;
         if (resIndex < newText.length) {
-            const marks = this._editorView.state.storedMarks ?? [];
-            this._editorView.dispatch(this._editorView.state.tr.insertText(newText[resIndex]).setStoredMarks(marks));
-            setTimeout(() => {
-                this.animateRes(resIndex + 1, newText);
-            }, 20);
+            const marks = this._editorView?.state.storedMarks ?? [];
+            this._editorView?.dispatch(this._editorView?.state.tr.insertText(newText[resIndex]).setStoredMarks(marks));
+            setTimeout(() => this.animateRes(resIndex + 1, newText), 20);
         }
     };
 
-- 
cgit v1.2.3-70-g09d2


From ae9404e2c80555875f2fd69f4ae55105ae51168b Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Wed, 24 Apr 2024 18:44:28 -0400
Subject: from last

---
 src/client/views/nodes/formattedText/FormattedTextBox.tsx | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
index 36c1de841..a46b19a85 100644
--- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx
+++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
@@ -996,15 +996,11 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB
             let res = await gptAPICall((this.dataDoc.text as RichTextField)?.Text, GPTCallType.COMPLETION);
             if (!res) {
                 this.animateRes(0, 'Something went wrong.');
-            } else {
-                if (!this._editorView) return;
-                // No animation
-                // this._editorView.dispatch(this._editorView.state.tr.insertText(res));
-
-                // Animation
-                // Set selection at end
-                const sel = Selection.atEnd(this._editorView.state.doc);
-                this._editorView.dispatch(this._editorView.state.tr.setSelection(sel));
+            } else if (this._editorView) {
+                const { dispatch, state } = this._editorView;
+                // for no animation, use: dispatch(state.tr.insertText(res));
+                // for animted response starting at end of text, use:
+                dispatch(state.tr.setSelection(Selection.atEnd(state.doc)));
                 this.animateRes(0, '\n\n' + res);
             }
         } catch (err) {
-- 
cgit v1.2.3-70-g09d2


From 2caf7b7bb80b663b6ba585f88cdbd2d725f8505e Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Thu, 25 Apr 2024 18:49:57 -0400
Subject: pinning freeform contents now captures the layout

---
 .../views/collections/collectionFreeForm/CollectionFreeFormView.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 3fab00968..079a5d977 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -1412,7 +1412,11 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
             presentation_transition: 500,
             annotationOn: this.Document,
         });
-        PresBox.pinDocView(anchor, { pinDocLayout: pinProps?.pinDocLayout, pinData: { ...(pinProps?.pinData ?? {}), pannable: !this.Document.isGroup, type_collection: true, filters: true } }, this.Document);
+        PresBox.pinDocView(
+            anchor,
+            { pinDocLayout: pinProps?.pinDocLayout, pinData: { ...(pinProps?.pinData ? { ...pinProps.pinData, poslayoutview: pinProps.pinData.dataview } : {}), pannable: !this.Document.isGroup, type_collection: true, filters: true } },
+            this.Document
+        );
 
         if (addAsAnnotation) {
             if (Cast(this.dataDoc[this._props.fieldKey + '_annotations'], listSpec(Doc), null) !== undefined) {
-- 
cgit v1.2.3-70-g09d2