diff options
4 files changed, 33 insertions, 5 deletions
diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx index 9f96163cd..b644db0b3 100644 --- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx +++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx @@ -30,10 +30,6 @@ import { ImageLabelBoxData } from './ImageLabelBox'; import { MarqueeOptionsMenu } from './MarqueeOptionsMenu'; import { StrListCast } from '../../../../fields/Doc'; import { requestAiGeneratedPreset, DocumentDescriptor } from '../../nodes/scrapbook/AIPresetGenerator'; -import { ScrapbookItemConfig } from '../../nodes/scrapbook/ScrapbookPreset'; -import { OverlayView } from '../../OverlayView'; -import { runInAction } from 'mobx'; -import { ScrapbookPicker } from '../../nodes/scrapbook/ScrapbookPicker'; import { buildPlaceholdersFromConfigs, slotRealDocIntoPlaceholders } from '../../nodes/scrapbook/ScrapbookBox'; import './MarqueeView.scss'; diff --git a/src/client/views/nodes/scrapbook/ScrapbookBox.tsx b/src/client/views/nodes/scrapbook/ScrapbookBox.tsx index d1d357d4c..52e3c26dc 100644 --- a/src/client/views/nodes/scrapbook/ScrapbookBox.tsx +++ b/src/client/views/nodes/scrapbook/ScrapbookBox.tsx @@ -28,6 +28,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faRedoAlt } from '@fortawesome/free-solid-svg-icons'; import { getPresetNames, createPreset } from './ScrapbookPresetRegistry'; import './ScrapbookBox.scss'; +import { isDestArraysEqual } from 'pdfjs-dist/types/web/pdf_history'; export function buildPlaceholdersFromConfigs(configs: ScrapbookItemConfig[]): Doc[] { @@ -267,6 +268,21 @@ export class ScrapbookBox extends ViewBoxAnnotatableComponent<FieldViewProps>() placeholder4.y = -100; placeholder4._width = 100; placeholder4._height = 200; + + const starter = Docs.Create.TextDocument('To create a scrapbook from existing documents, marquee select. For existing scrapbook arrangements, select a preset from the dropdown.'); + starter.accepts_docType = DocumentType.RTF; + starter.accepts_tagType = 'n/a' + const starterplaceholder = new Doc(); + starterplaceholder.proto = summary; + starterplaceholder.original = summary; + starterplaceholder.x = 0; + starterplaceholder.y = 0; + starterplaceholder._width = 250; + + + + + /*note-to-self would doing: @@ -280,7 +296,7 @@ export class ScrapbookBox extends ViewBoxAnnotatableComponent<FieldViewProps>() /*note-to-self difference between passing a new List<Doc> versus just the raw array? */ - this.dataDoc[this.fieldKey] = new List<Doc>([placeholder, placeholder2, placeholder3, placeholder4]); + this.dataDoc[this.fieldKey] = new List<Doc>([starterplaceholder]); } diff --git a/src/client/views/nodes/scrapbook/ScrapbookPreset.tsx b/src/client/views/nodes/scrapbook/ScrapbookPreset.tsx index 96a8e9b5f..3ce235803 100644 --- a/src/client/views/nodes/scrapbook/ScrapbookPreset.tsx +++ b/src/client/views/nodes/scrapbook/ScrapbookPreset.tsx @@ -3,6 +3,7 @@ import { DocumentType } from '../../../documents/DocumentTypes'; export enum ScrapbookPresetType { Default = 'Default', Classic = 'Classic', + None = 'None', Collage = 'Collage', Spotlight = 'Spotlight', Gallery = 'Gallery' @@ -29,6 +30,8 @@ export interface ScrapbookItemConfig { export class ScrapbookPreset { static createPreset(presetType: ScrapbookPresetType): ScrapbookItemConfig[] { switch (presetType) { + case ScrapbookPresetType.None: + return ScrapbookPreset.createNonePreset(); case ScrapbookPresetType.Classic: return ScrapbookPreset.createClassicPreset(); case ScrapbookPresetType.Collage: @@ -44,6 +47,18 @@ export class ScrapbookPreset { } } + private static createNonePreset(): ScrapbookItemConfig[] { + return [ + + { type: DocumentType.RTF, + tag: 'To create a scrapbook from existing documents, marquee select. For existing scrapbook arrangements, select a preset from the dropdown.', + acceptTags: ['n/a'], + x: 0, y: 0, width: 250, height: 100 + }, + + ]; + } + private static createClassicPreset(): ScrapbookItemConfig[] { return [ { type: DocumentType.IMG, diff --git a/src/client/views/nodes/scrapbook/ScrapbookPresetRegistry.ts b/src/client/views/nodes/scrapbook/ScrapbookPresetRegistry.ts index d6fd3620c..c6d67ab73 100644 --- a/src/client/views/nodes/scrapbook/ScrapbookPresetRegistry.ts +++ b/src/client/views/nodes/scrapbook/ScrapbookPresetRegistry.ts @@ -36,6 +36,7 @@ export function createPreset(name: string): ScrapbookItemConfig[] { // Register built-in presets import { ScrapbookPreset } from './ScrapbookPreset'; +registerPreset(ScrapbookPresetType.None, () => ScrapbookPreset.createPreset(ScrapbookPresetType.None)); registerPreset(ScrapbookPresetType.Classic, () => ScrapbookPreset.createPreset(ScrapbookPresetType.Classic)); registerPreset(ScrapbookPresetType.Collage, () => ScrapbookPreset.createPreset(ScrapbookPresetType.Collage)); registerPreset(ScrapbookPresetType.Spotlight, () => ScrapbookPreset.createPreset(ScrapbookPresetType.Spotlight)); |