fixed frame animtation to not write 0's by default. fixed lightbox stepinto to restore collection pan/zoom correctly. removed firefly unused ai buttons from imagebox.

4 files changed, 23 insertions, 81 deletions

diff --git a/src/client/views/LightboxView.tsx b/src/client/views/LightboxView.tsx
index 0be847281..5698da785 100644
--- a/src/client/views/LightboxView.tsx
+++ b/src/client/views/LightboxView.tsx
@@ -93,7 +93,7 @@ export class LightboxView extends ObservableReactComponent<LightboxViewProps> {
             savedKeys.forEach(key => {
                 lightDoc[key] = this._savedState[key];
             });
-        this._savedState = {};
+        lightDoc !== doc && (this._savedState = {});
 
         if (doc) {
             lightDoc !== doc &&
@@ -136,9 +136,7 @@ export class LightboxView extends ObservableReactComponent<LightboxViewProps> {
         return this.SetLightboxDoc(
             doc,
             undefined,
-            [...DocListCast(doc[Doc.LayoutFieldKey(doc)]), ...DocListCast(doc[Doc.LayoutFieldKey(doc) + '_annotations']).filter(anno => anno.annotationOn !== doc), ...this._future].sort(
-                (a, b) => NumCast(b._timecodeToShow) - NumCast(a._timecodeToShow)
-            ),
+            [...DocListCast(doc[Doc.LayoutFieldKey(doc) + '_annotations']).filter(anno => anno.annotationOn !== doc), ...this._future].sort((a, b) => NumCast(b._timecodeToShow) - NumCast(a._timecodeToShow)),
             layoutTemplate
         );
     };
diff --git a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
index 76d6ed80b..ce1e9280a 100644
--- a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
+++ b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
@@ -180,7 +180,7 @@ export class CollectionFreeFormDocumentView extends DocComponent<CollectionFreeF
         const timecode = Math.round(time);
         Object.keys(vals).forEach(val => {
             const findexed = Cast(d[`${val}_indexed`], listSpec('number'), []).slice();
-            findexed[timecode] = vals[val] || 0;
+            findexed[timecode] = vals[val] as unknown as number;
             d[`${val}_indexed`] = new List<number>(findexed);
         });
     }
diff --git a/src/client/views/nodes/ImageBox.scss b/src/client/views/nodes/ImageBox.scss
index 671621bbe..15581a9e8 100644
--- a/src/client/views/nodes/ImageBox.scss
+++ b/src/client/views/nodes/ImageBox.scss
@@ -195,8 +195,9 @@
         flex-direction: row;
         gap: 5px;
         width: 100%;
+        padding: 0 10;
         .imageBox-aiView-regenerate-createBtn {
-            max-width: 10%;
+            max-width: 20%;
             .button-container {
                 width: 100% !important;
                 justify-content: left !important;
@@ -207,7 +208,7 @@
     .imageBox-aiView-firefly {
         overflow: hidden;
         text-overflow: ellipsis;
-        max-width: 10%;
+        max-width: 15%;
         width: 100%;
     }
     .imageBox-aiView-regenerate-send {
@@ -218,7 +219,7 @@
         text-align: center;
         align-items: center;
         display: flex;
-        max-width: 25%;
+        max-width: 90%;
         width: 100%;
         .imageBox-aiView-similarity {
             max-width: 65;
diff --git a/src/client/views/nodes/ImageBox.tsx b/src/client/views/nodes/ImageBox.tsx
index 279317f49..4979a4d4d 100644
--- a/src/client/views/nodes/ImageBox.tsx
+++ b/src/client/views/nodes/ImageBox.tsx
@@ -624,28 +624,10 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
                         className="imageBox-aiView-input"
                         aria-label="Edit instructions input"
                         type="text"
-                        value={this._regenInput}
+                        value={this._regenInput || StrCast(this.Document.title)}
                         onChange={action(e => this._canInteract && (this._regenInput = e.target.value))}
                         placeholder={this._regenInput || StrCast(this.Document.title)}
                     />
-                    <div className="imageBox-aiView-strength">
-                        <span className="imageBox-aiView-similarity">Similarity</span>
-                        <Slider
-                            className="imageBox-aiView-slider"
-                            sx={{
-                                '& .MuiSlider-track': { color: SettingsManager.userVariantColor },
-                                '& .MuiSlider-rail': { color: SettingsManager.userBackgroundColor },
-                                '& .MuiSlider-thumb': { color: SettingsManager.userVariantColor, '&.Mui-focusVisible, &:hover, &.Mui-active': { boxShadow: `0px 0px 0px 8px${SettingsManager.userColor.slice(0, 7)}10` } },
-                            }}
-                            min={0}
-                            max={100}
-                            step={1}
-                            size="small"
-                            value={this._fireflyRefStrength}
-                            onChange={action((e, val) => this._canInteract && (this._fireflyRefStrength = val as number))}
-                            valueLabelDisplay="auto"
-                        />
-                    </div>
                     <div className="imageBox-aiView-regenerate-createBtn">
                         <Button
                             text="Create"
@@ -680,61 +662,22 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
                         />
                     </div>
                 </div>
-                <div className="imageBox-aiView-options">
-                    <span className="imageBox-aiView-subtitle"> More: </span>
-                    <Button
-                        type={Type.TERT}
-                        text="Get Text"
-                        icon={<FontAwesomeIcon icon="font" />}
-                        color={SettingsManager.userBackgroundColor}
-                        iconPlacement="right"
-                        onClick={() => {
-                            Networking.PostToServer('/queryFireflyImageText', {
-                                file: (file => {
-                                    const ext = extname(file);
-                                    return file.replace(ext, (this._error ? '_o' : this._curSuffix) + ext);
-                                })(ImageCast(this.Document[Doc.LayoutFieldKey(this.Document)])?.url.href),
-                            }).then(text => alert(text));
-                        }}
-                    />
-                    <Button
-                        type={Type.TERT}
-                        text="Generative Fill"
-                        icon={<FontAwesomeIcon icon="fill" />}
-                        color={SettingsManager.userBackgroundColor}
-                        iconPlacement="right"
-                        onClick={action(() => {
-                            ImageEditorData.Open = true;
-                            ImageEditorData.Source = (field && this.choosePath(field.url)) || '';
-                            ImageEditorData.AddDoc = this._props.addDocument;
-                            ImageEditorData.RootDoc = this.Document;
-                        })}
-                    />
-                    <Button
-                        type={Type.TERT}
-                        text="Expand"
-                        icon={<FontAwesomeIcon icon="expand" />}
-                        color={SettingsManager.userBackgroundColor}
-                        iconPlacement="right"
-                        onClick={() => {
-                            Networking.PostToServer('/expandImage', {
-                                prompt: 'sunny skies',
-                                file: (file => {
-                                    const ext = extname(file);
-                                    return file.replace(ext, (this._error ? '_o' : this._curSuffix) + ext);
-                                })(ImageCast(this.Document[Doc.LayoutFieldKey(this.Document)])?.url.href),
-                            }).then(res => {
-                                const info = res as Upload.ImageInformation;
-                                const img = Docs.Create.ImageDocument(info.accessPaths.agnostic.client, { title: 'expand:' + this.Document.title });
-                                DocUtils.assignImageInfo(info, img);
-                                const genratedDocs = this.Document.generatedDocs
-                                    ? DocCast(this.Document.generatedDocs)
-                                    : Docs.Create.MasonryDocument([], { _width: 400, _height: 400, x: NumCast(this.Document.x) + NumCast(this.Document.width), y: NumCast(this.Document.y) });
-                                Doc.AddDocToList(genratedDocs, undefined, img);
-                                this.Document[DocData].generatedDocs = genratedDocs;
-                                if (!DocumentView.getFirstDocumentView(genratedDocs)) this._props.addDocTab(genratedDocs, OpenWhere.addRight);
-                            });
+                <div className="imageBox-aiView-strength">
+                    <span className="imageBox-aiView-similarity">Similarity</span>
+                    <Slider
+                        className="imageBox-aiView-slider"
+                        sx={{
+                            '& .MuiSlider-track': { color: SettingsManager.userVariantColor },
+                            '& .MuiSlider-rail': { color: SettingsManager.userBackgroundColor },
+                            '& .MuiSlider-thumb': { color: SettingsManager.userVariantColor, '&.Mui-focusVisible, &:hover, &.Mui-active': { boxShadow: `0px 0px 0px 8px${SettingsManager.userColor.slice(0, 7)}10` } },
                         }}
+                        min={0}
+                        max={100}
+                        step={1}
+                        size="small"
+                        value={this._fireflyRefStrength}
+                        onChange={action((e, val) => this._canInteract && (this._fireflyRefStrength = val as number))}
+                        valueLabelDisplay="auto"
                     />
                 </div>
             </div>