From 59678e34dad0b6587f28ec642c84f6c6ee06543b Mon Sep 17 00:00:00 2001 From: Nathan-SR <144961007+Nathan-SR@users.noreply.github.com> Date: Sun, 11 May 2025 02:08:38 -0400 Subject: firefly templates correctly loading --- .../DocCreatorMenu/Menu/TemplateEditingWindow.tsx | 14 +++++++------- .../DataVizBox/DocCreatorMenu/Menu/TemplatePreviewBox.tsx | 4 ++-- .../DataVizBox/DocCreatorMenu/Menu/TemplatePreviewGrid.tsx | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateEditingWindow.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateEditingWindow.tsx index f34b7efcf..fa84616cc 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateEditingWindow.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplateEditingWindow.tsx @@ -75,10 +75,11 @@ export class TemplateEditingWindow extends ObservableReactComponent) => {component.forceUpdate();}]} + previewBoxRightButtonOpts={['gear', (template: Template) => {this.forceUpdate();}]} />
@@ -93,18 +94,17 @@ export class TemplateEditingWindow extends ObservableReactComponent { const newTemplate: Template = this._props.template.cloneBase(); - newTemplate.setImageAsBackground(url, true); - templates.push(newTemplate); + this._props.menu._variations.push(newTemplate); }); this._loading = false; setTimeout(() => { - console.log('setting') - this._props.menu._variations = templates; + this._variationURLs.forEach((url, i) => { + this._props.menu._variations[i].setImageAsBackground(url, true); + }); this.forceUpdate(); - }, 1000); + }); }) }> diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewBox.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewBox.tsx index a7270e540..e94ddfc15 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewBox.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewBox.tsx @@ -19,8 +19,8 @@ import { ImageCast } from "../../../../../../fields/Types"; export interface TemplatePreviewBoxProps { template: Template; menu: DocCreatorMenu; - leftButtonOpts?: [icon: IconProp, func: (template: Template) => void] - rightButtonOpts?: [icon: IconProp, func: (template: Template) => void] + leftButtonOpts?: [icon: IconProp, func: (...args: any) => void] + rightButtonOpts?: [icon: IconProp, func: (...args: any) => void] } export class TemplatePreviewBox extends ObservableReactComponent { diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewGrid.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewGrid.tsx index fb246a0a0..e78109b62 100644 --- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewGrid.tsx +++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/Menu/TemplatePreviewGrid.tsx @@ -17,9 +17,9 @@ export interface SuggestedTemplatesProps { loading?: boolean; templates: Template[]; title: string; - optionsButtonOpts?: [string, (...args: any) => any]; - previewBoxLeftButtonOpts?: [string, (...args: any) => any]; - previewBoxRightButtonOpts?: [string, (...args: any) => any]; + optionsButtonOpts?: [IconProp, (...args: any) => any]; + previewBoxLeftButtonOpts?: [IconProp, (...args: any) => any]; + previewBoxRightButtonOpts?: [IconProp, (...args: any) => any]; setupButtonClick: (e: React.PointerEvent, func: () => void) => void; } @@ -45,7 +45,7 @@ export class TemplatePreviewGrid extends ObservableReactComponent { this.props.menu.setExpandedView(template); this.forceUpdate(); }]} - rightButtonOpts={["plus", (template: Template) => {}]} + rightButtonOpts={this._props.previewBoxRightButtonOpts} /> ))}
-- cgit v1.2.3-70-g09d2