diff options
| -rw-r--r-- | src/client/views/nodes/ImageBox.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/nodes/formattedText/FormattedTextBox.tsx | 28 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/client/views/nodes/ImageBox.tsx b/src/client/views/nodes/ImageBox.tsx index e2ecca0b6..1eaf86c56 100644 --- a/src/client/views/nodes/ImageBox.tsx +++ b/src/client/views/nodes/ImageBox.tsx @@ -326,7 +326,7 @@ export class ImageBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp @computed get nativeSize() { TraceMobx(); const nativeWidth = NumCast(this.dataDoc[this.fieldKey + '-nativeWidth'], NumCast(this.layoutDoc[this.fieldKey + '-nativeWidth'], 500)); - const nativeHeight = NumCast(this.dataDoc[this.fieldKey + '-nativeHeight'], NumCast(this.layoutDoc[this.fieldKey + '-nativeHeight'], 1)); + const nativeHeight = NumCast(this.dataDoc[this.fieldKey + '-nativeHeight'], NumCast(this.layoutDoc[this.fieldKey + '-nativeHeight'], 500)); const nativeOrientation = NumCast(this.dataDoc[this.fieldKey + '-nativeOrientation'], 1); return { nativeWidth, nativeHeight, nativeOrientation }; } diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx index 683ccb9c4..d4dffcb62 100644 --- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx +++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx @@ -64,6 +64,8 @@ import { SummaryView } from './SummaryView'; import applyDevTools = require('prosemirror-dev-tools'); import React = require('react'); import { Configuration, OpenAIApi } from 'openai'; +import { CollectionSubView, SlowLoadDocuments } from '../../collections/CollectionSubView'; +import { Networking } from '../../../Network'; const translateGoogleApi = require('translate-google-api'); export const GoogleRef = 'googleDocId'; @@ -861,12 +863,20 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FieldViewProps let image_url = response.data.data[0].url; console.log(image_url); if (image_url) { - const newDoc = Docs.Create.ImageDocument(image_url, { - x: NumCast(this.rootDoc.x) + NumCast(this.layoutDoc._width) + 10, - y: NumCast(this.rootDoc.y), - _height: 200, - _width: 200 + const batch = UndoManager.StartBatch('generate openAI image'); + // const loadingDoc = SlowLoadDocuments(image_url, , [], "", emptyFunction, NumCast(this.rootDoc.x) + NumCast(this.layoutDoc._width) + 10, NumCast(this.rootDoc.y), this.addDocument, this.props.Document._viewType === CollectionViewType.Freeform).then(batch.end); + const [{ accessPaths }] = await Networking.PostToServer('/uploadRemoteImage', { sources: [image_url] }); + const source = Utils.prepend(accessPaths.agnostic.client); + const newDoc = Docs.Create.ImageDocument(source, { + x: NumCast(this.rootDoc.x) + NumCast(this.layoutDoc._width) + 10, + y: NumCast(this.rootDoc.y), + _height: 200, + _width: 200, + // _nativeWidth: 200, + // _nativeHeight: 200 }) + // Doc.GetProto(newDoc)["data-nativeHeight"] = 200; + // Doc.GetProto(newDoc)["data-nativeWidth"] = 200; if (DocListCast(Doc.MyOverlayDocs?.data).includes(this.rootDoc)) { newDoc.overlayX = this.rootDoc.x; newDoc.overlayY = NumCast(this.rootDoc.y) + NumCast(this.rootDoc._height); @@ -874,12 +884,8 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FieldViewProps } else { this.props.addDocument?.(newDoc); } - setTimeout(() => { - newDoc.data = image_url; - newDoc._height = 200; - newDoc._width = 200; - DocUtils.MakeLink({doc: this.rootDoc}, {doc: newDoc}, "Dall-E"); - }, 500) + + DocUtils.MakeLink({doc: this.rootDoc}, {doc: newDoc}, "Dall-E"); } } catch (err) { console.log(err); |