bookish-press 0.4.45 → 0.4.47

package/src/lib/components/editor/CalloutEditor.svelte

@@ -0,0 +1,14 @@
+<script lang="ts">
+    import type CalloutNode from '$lib/models/chapter/CalloutNode';
+    import PositionEditor from './PositionEditor.svelte';
+    import { getCaret } from '$lib/components/page/Contexts';
+
+    export let callout: CalloutNode;
+
+    let caret = getCaret();
+</script>
+
+<PositionEditor
+    value={callout.getPosition()}
+    edit={(position) => $caret?.edit(callout, callout.withPosition(position))}
+/>

package/{components → src/lib/components}/editor/CaptionedCodeEditor.svelte

@@ -1,9 +1,13 @@
-<script>import LanguageEditor from './LanguageEditor.svelte';
-import PositionEditor from './PositionEditor.svelte';
-import Switch from './Switch.svelte';
-import { getCaret } from '../page/Contexts';
-export let code;
-let caret = getCaret();
+<script lang="ts">
+    import type CodeNode from '$lib/models/chapter/CodeNode';
+    import LanguageEditor from './LanguageEditor.svelte';
+    import PositionEditor from './PositionEditor.svelte';
+    import Switch from '$lib/components/editor/Switch.svelte';
+    import { getCaret } from '$lib/components/page/Contexts';
+
+    export let code: CodeNode;
+
+    let caret = getCaret();
 </script>
 
 <span>

package/src/lib/components/editor/CaretContext.ts

@@ -0,0 +1,55 @@
+import type Caret from '$lib/models/chapter/Caret';
+import type { CaretRange } from '$lib/models/chapter/Caret';
+import type ParagraphNode from '$lib/models/chapter/ParagraphNode';
+import type AtomNode from '$lib/models/chapter/AtomNode';
+import type FormatNode from '$lib/models/chapter/FormatNode';
+import type BlocksNode from '$lib/models/chapter/BlocksNode';
+import type ListNode from '$lib/models/chapter/ListNode';
+import type TableNode from '$lib/models/chapter/TableNode';
+import type MetadataNode from '$lib/models/chapter/MetadataNode';
+import type RootNode from '$lib/models/chapter/RootNode';
+import type Edit from '$lib/models/chapter/Edit';
+import type CodeNode from '$lib/models/chapter/CodeNode';
+import type BlockNode from '$lib/models/chapter/BlockNode';
+import type Clipboard from './Clipboard';
+import type UndoState from './UndoState';
+import type Node from '$lib/models/chapter/Node';
+
+export type PasteContent = { plain: string | undefined };
+
+type CaretContext = {
+    chapter: boolean;
+    range: CaretRange;
+    start: Caret;
+    end: Caret;
+    isSelection: boolean;
+    root: RootNode;
+    blocks: BlocksNode | undefined;
+    paragraph: ParagraphNode | undefined;
+    block: BlockNode | undefined;
+    includesList: boolean;
+    code: CodeNode | undefined;
+    list: ListNode | undefined;
+    table: TableNode | undefined;
+    format: FormatNode | undefined;
+    atom: AtomNode<any> | undefined;
+    meta: MetadataNode<any> | undefined;
+    startIsText: boolean;
+    endIsText: boolean;
+    startIsTextOrAtom: boolean;
+    endIsTextOrAtom: boolean;
+    atParagraphStart: boolean;
+    undoStack: UndoState[];
+    undoPosition: number;
+    undo: () => Edit;
+    redo: () => Edit;
+    clipboard: Clipboard;
+    handleCopy: (node: Node) => void;
+    handlePaste: (
+        context: CaretContext,
+        text: PasteContent | Node,
+        save: boolean
+    ) => Edit;
+};
+
+export default CaretContext;

package/{components/editor/CaretState.d.ts → src/lib/components/editor/CaretState.ts}

@@ -1,19 +1,18 @@
-import type { CaretRange } from '../../models/chapter/Caret';
-import type RootNode from '../../models/chapter/RootNode';
+import type { CaretRange } from '$lib/models/chapter/Caret';
+import type RootNode from '$lib/models/chapter/RootNode';
 import type CaretContext from './CaretContext';
-import type Node from '../../models/chapter/Node';
+import type Node from '$lib/models/chapter/Node';
 import type Command from './Command';
+
 type CaretState = {
     root: RootNode;
     range: CaretRange | undefined;
-    coordinate: {
-        x: number;
-        y: number;
-    } | undefined;
+    coordinate: { x: number; y: number } | undefined;
     context: CaretContext | undefined;
     edit: (previous: Node, edited: Node) => void;
     setCaret: (range: CaretRange) => void;
     executor: (command: Command, key: string) => void;
     focused: boolean;
 };
+
 export default CaretState;

package/{components/editor/CaretUtilities.d.ts → src/lib/components/editor/CaretUtilities.ts}

@@ -1,4 +1,5 @@
 import type Caret from '../../models/chapter/Caret';
+
 type CaretUtilities = {
     getCaretOnLine: (caret: Caret, below: boolean) => Caret;
 };

package/{components → src/lib/components}/editor/CaretView.svelte

@@ -1,23 +1,28 @@
-<script>import { afterUpdate } from 'svelte';
-export let left;
-export let top;
-export let height;
-export let linked;
-export let italic;
-export let bold;
-export let disabled;
-export let ignored;
-export let blink;
-export let locked;
-let element;
-let headerHeight = 0;
-// When the caret updates, make sure it's in view.
-afterUpdate(() => {
-    element?.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
-    headerHeight =
-        document.querySelector('.bookish-app > .header')
-            ?.offsetHeight ?? 0;
-});
+<script lang="ts">
+    import { afterUpdate } from 'svelte';
+
+    export let left: number;
+    export let top: number;
+    export let height: number;
+    export let linked: boolean;
+    export let italic: boolean;
+    export let bold: boolean;
+    export let disabled: boolean;
+    export let ignored: boolean;
+    export let blink: boolean;
+    export let locked: boolean;
+
+    let element: HTMLElement;
+
+    let headerHeight = 0;
+
+    // When the caret updates, make sure it's in view.
+    afterUpdate(() => {
+        element?.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+        headerHeight =
+            (document.querySelector('.bookish-app > .header') as HTMLElement)
+                ?.offsetHeight ?? 0;
+    });
 </script>
 
 <div

package/src/lib/components/editor/CitationsEditor.svelte

@@ -0,0 +1,64 @@
+<script lang="ts">
+    import type CitationsNode from '$lib/models/chapter/CitationsNode';
+    import Note from './Note.svelte';
+    import Options from '../app/Options.svelte';
+    import Button from '../app/Button.svelte';
+    import { getCaret, getEdition } from '$lib/components/page/Contexts';
+
+    export let citations: CitationsNode;
+
+    let caret = getCaret();
+    let edition = getEdition();
+
+    let value = '';
+
+    function handleSelection(selection: string) {
+        if (selection.length > 0)
+            update(new Set([...citations.getMeta(), selection]));
+    }
+
+    function removeSelection(citationID: string) {
+        let ids = new Set(citations.getMeta());
+        ids.delete(citationID);
+        update(ids);
+    }
+
+    function update(set: Set<string>) {
+        $caret?.edit(citations, citations.withMeta(Array.from(set)));
+    }
+
+    $: uncited =
+        $edition === undefined
+            ? []
+            : Object.keys($edition.getReferences())
+                  .filter(
+                      (citationID) => !citations.getMeta().includes(citationID)
+                  )
+                  .sort();
+    let options: [string, string][] = [];
+    $: {
+        options = [];
+        options.push([
+            uncited.length > 0 ? 'Choose references' : 'No uncited references',
+            '',
+        ]);
+        for (const citationID of uncited)
+            options.push([citationID, citationID]);
+    }
+</script>
+
+<Options
+    {options}
+    bind:value
+    changed={handleSelection}
+    label="choose citations"
+/>
+{#each citations.getMeta() as citationID}
+    {citationID}
+    <Button
+        tooltip="Remove citation"
+        command={() => removeSelection(citationID)}>&times; citation</Button
+    >
+{:else}
+    <Note>&mdash;</Note>
+{/each}

package/{components/editor/Clipboard.d.ts → src/lib/components/editor/Clipboard.ts}

@@ -1,3 +1,4 @@
-import type Node from '../../models/chapter/Node';
+import type Node from '$lib/models/chapter/Node';
+
 type Clipboard = undefined | Node;
 export default Clipboard;

package/{components/editor/Command.d.ts → src/lib/components/editor/Command.ts}

@@ -1,6 +1,7 @@
-import type Edit from '../../models/chapter/Edit';
+import type Edit from '$lib/models/chapter/Edit';
 import type CaretUtilities from './CaretUtilities';
 import type CaretContext from './CaretContext';
+
 type Command = {
     icon: string;
     description: string;
@@ -14,6 +15,11 @@ type Command = {
     mutates: boolean;
     visible: boolean | ((context: CaretContext) => boolean);
     active: boolean | ((context: CaretContext, key?: string) => boolean);
-    handler: (context: CaretContext, utilities: CaretUtilities, key: string) => Edit;
+    handler: (
+        context: CaretContext,
+        utilities: CaretUtilities,
+        key: string
+    ) => Edit;
 };
+
 export default Command;