8b84368e3a
* Clarify some comments * Don't destructure insertion trigger * Make superscript and subscript use domlib/surround * Create new {Text,Highlight}ColorButton * Use domlib/surround for textcolor - However there's still a crucial bug, when you're breaking existing colored span when unsurrounding, their color is not restored * Add underline format to removeFormats * Simplify type of ElementMatcher and ElementClearer for end users * Add some comments for normalize-insertion-ranges * Split normalize-insertion-ranges into remove-adjacent and remove-within * Factor out find-remove from unsurround.ts * Rename merge-mach, simplify remove-within * Clarify some comments * Refactor first reduce * Refactor reduceRight * Flatten functions in merge-ranges * Move some functionality to merge-ranges and do not export * Refactor merge-ranges * Remove createInitialMergeMatch * Finish refactoring of merge-ranges * Refactor merge-ranges to minimal-ranges and add some unit testing * Move more logic into text-node * Remove most most of the logic from remove-adjacent - remove-adjacent is still part of the "merging" logic, as it increases the scope of the child node ranges * Add some tests for edge cases * Merge remove-adjacent logic into minimal-ranges * Refactor unnecessary list destructuring * Add some TODOs * Put removing nodes and adding new nodes into sequence * Refactor MatchResult to MatchType and return clear from matcher * Inline surround/helpers * Shorten name of param * Add another edge case test * Add an example where commonAncestorContainer != normalization level * Fix bug in find-adjacent when find more than one nested nodes * Allow comments for Along type * Simplify find-adjacent by removing intermediate and/or curried functions * Remove extend-adjacent * Add more tests when find-adjacent finds by descension * Fix find-adjacent descending into block-level elements * Add clarifying comment to refusing to descend into block-level elements * Move shifting logic into find-adjacent * Rename file matcher to match-type * Give a first implemention of TreeVertex * Remove MatchType.ALONG - findAdjacent now directly modifies the range * Rename MatchType.MATCH into MatchType.REMOVE * Implement a version of find-within that utilizies match-tree * Turn child node range into a class * Fix bug in new find-adjacent function * Make all find-adjacent tests test for ranges * Surrounding within farthestMatchingAncestor when available * Fix an issue with negligable elements - also rename "along" elements to "negligable" * Add two TODOs to SurroundFormat interface * Have a messy first implementation of the new tree-node algorithm * Maintain whether formatting nodes are covered or within user selection * Move covered and insideRange into TreeNode superclass * Reimplement findAdjacent logic * Add extension logic * Add an evaluate method to nodes * Introduce BlockNode * Add a first evaluate implementation * Add left shift and inner shift logic * Implement SurroundFormatUser * Allow pass in formatter, ascender and merger from outside * Fix insideRange and covered switch-up * Fix MatchNode.prototype.isAscendable * Fix another switch-up of covered and insideRange... * Remove a lot of old code * Have surround functions only return the range - I still cannot think of a good reason why we should return addedNodes and removedNodes, except for testing. * Create formatting-tree directory * Create build-tree directory + Move find-above up to /domlib * Remove range-anchors * Move unsurround logic into no-splitting * Fix extend-merge * Fix inner shift being eroneusly returned as left shift * Fix oversight in SplitRange * Redefine how ranges are recreated * Rename covered to insideMatch and put as fourth parameter instead of third * Keep track of match holes and match leaves * Rename ChildNodeRange to FlatRange * Change signature of matcher * Fix bug in extend-merge * Improve Match class * Utilize cache in TextColorButton * Implement getBaseSurrounder for TextColorButton * Add matchAncestors field to FormattingNode * Introduce matchAncestors and getCache * Do clearing during parsing already - This way, you know whether elements will be removed before getting to Formatting nodes * Make HighlightColorButton use our surround mechanism * Fix a bug with calling .removeAttribute and .hasAttribute * Add side button to RemoveFormat button * Add disabled to remove format side button * Expose remove formats on RemoveFormat button * Reinvent editor/surround as Surrounder class * Fix split-text when working with insert trigger * Try counteracting the contenteditable's auto surrounding * Remove matching elements before normalizing * Rewrite match-type * Move setting match leaves into build * Change editing strings - So that color strings match bold/italic strings better * Fix border radius of List options menu * Implement extensions functionality * Remove some unnecessary code * Fix split range endOffset * Type MatchType * Reformat MatchType + add docs * Fix domlib/surround/apply * Satisfy last tests * Register Surrounder as package * Clarify some comments * Correctly implement reformat * Reformat with inactive eraser formats * Clear empty spans with RemoveFormatButton * Fix Super/Subscript button * Use ftl string for hardcoded tooltip * Adjust wording
167 lines
6.1 KiB
Svelte
167 lines
6.1 KiB
Svelte
<!--
|
|
Copyright: Ankitects Pty Ltd and contributors
|
|
License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
-->
|
|
<script lang="ts">
|
|
import ButtonDropdown from "../../components/ButtonDropdown.svelte";
|
|
import ButtonGroup from "../../components/ButtonGroup.svelte";
|
|
import ButtonGroupItem, {
|
|
createProps,
|
|
setSlotHostContext,
|
|
updatePropsList,
|
|
} from "../../components/ButtonGroupItem.svelte";
|
|
import DynamicallySlottable from "../../components/DynamicallySlottable.svelte";
|
|
import IconButton from "../../components/IconButton.svelte";
|
|
import Item from "../../components/Item.svelte";
|
|
import Shortcut from "../../components/Shortcut.svelte";
|
|
import WithDropdown from "../../components/WithDropdown.svelte";
|
|
import { getListItem } from "../../lib/dom";
|
|
import * as tr from "../../lib/ftl";
|
|
import { getPlatformString } from "../../lib/shortcuts";
|
|
import { execCommand } from "../helpers";
|
|
import { context } from "../NoteEditor.svelte";
|
|
import { editingInputIsRichText } from "../rich-text-input";
|
|
import CommandIconButton from "./CommandIconButton.svelte";
|
|
import {
|
|
indentIcon,
|
|
justifyCenterIcon,
|
|
justifyFullIcon,
|
|
justifyLeftIcon,
|
|
justifyRightIcon,
|
|
listOptionsIcon,
|
|
olIcon,
|
|
outdentIcon,
|
|
ulIcon,
|
|
} from "./icons";
|
|
|
|
export let api = {};
|
|
|
|
const outdentKeyCombination = "Control+Shift+,";
|
|
function outdentListItem() {
|
|
if (getListItem(document.activeElement!.shadowRoot!)) {
|
|
execCommand("outdent");
|
|
} else {
|
|
alert("Indent/unindent currently only works with lists.");
|
|
}
|
|
}
|
|
|
|
const indentKeyCombination = "Control+Shift+.";
|
|
function indentListItem() {
|
|
if (getListItem(document.activeElement!.shadowRoot!)) {
|
|
execCommand("indent");
|
|
} else {
|
|
alert("Indent/unindent currently only works with lists.");
|
|
}
|
|
}
|
|
|
|
const { focusedInput } = context.get();
|
|
$: disabled = !editingInputIsRichText($focusedInput);
|
|
</script>
|
|
|
|
<ButtonGroup>
|
|
<DynamicallySlottable
|
|
slotHost={ButtonGroupItem}
|
|
{createProps}
|
|
{updatePropsList}
|
|
{setSlotHostContext}
|
|
{api}
|
|
>
|
|
<ButtonGroupItem>
|
|
<CommandIconButton
|
|
key="insertUnorderedList"
|
|
tooltip={tr.editingUnorderedList()}
|
|
shortcut="Control+,">{@html ulIcon}</CommandIconButton
|
|
>
|
|
</ButtonGroupItem>
|
|
|
|
<ButtonGroupItem>
|
|
<CommandIconButton
|
|
key="insertOrderedList"
|
|
tooltip={tr.editingOrderedList()}
|
|
shortcut="Control+.">{@html olIcon}</CommandIconButton
|
|
>
|
|
</ButtonGroupItem>
|
|
|
|
<ButtonGroupItem>
|
|
<WithDropdown let:createDropdown>
|
|
<IconButton
|
|
{disabled}
|
|
on:mount={(event) => createDropdown(event.detail.button)}
|
|
>
|
|
{@html listOptionsIcon}
|
|
</IconButton>
|
|
|
|
<ButtonDropdown>
|
|
<Item id="justify">
|
|
<ButtonGroup>
|
|
<CommandIconButton
|
|
key="justifyLeft"
|
|
tooltip={tr.editingAlignLeft()}
|
|
--border-left-radius="5px"
|
|
--border-right-radius="0px"
|
|
>{@html justifyLeftIcon}</CommandIconButton
|
|
>
|
|
|
|
<CommandIconButton
|
|
key="justifyCenter"
|
|
tooltip={tr.editingCenter()}
|
|
>{@html justifyCenterIcon}</CommandIconButton
|
|
>
|
|
|
|
<CommandIconButton
|
|
key="justifyRight"
|
|
tooltip={tr.editingAlignRight()}
|
|
>{@html justifyRightIcon}</CommandIconButton
|
|
>
|
|
|
|
<CommandIconButton
|
|
key="justifyFull"
|
|
tooltip={tr.editingJustify()}
|
|
--border-right-radius="5px"
|
|
>{@html justifyFullIcon}</CommandIconButton
|
|
>
|
|
</ButtonGroup>
|
|
</Item>
|
|
|
|
<Item id="indentation">
|
|
<ButtonGroup>
|
|
<IconButton
|
|
tooltip="{tr.editingOutdent()} ({getPlatformString(
|
|
outdentKeyCombination,
|
|
)})"
|
|
{disabled}
|
|
on:click={outdentListItem}
|
|
--border-left-radius="5px"
|
|
--border-right-radius="0px"
|
|
>
|
|
{@html outdentIcon}
|
|
</IconButton>
|
|
|
|
<Shortcut
|
|
keyCombination={outdentKeyCombination}
|
|
on:action={outdentListItem}
|
|
/>
|
|
|
|
<IconButton
|
|
tooltip="{tr.editingIndent()} ({getPlatformString(
|
|
indentKeyCombination,
|
|
)})"
|
|
{disabled}
|
|
on:click={indentListItem}
|
|
--border-right-radius="5px"
|
|
>
|
|
{@html indentIcon}
|
|
</IconButton>
|
|
|
|
<Shortcut
|
|
keyCombination={indentKeyCombination}
|
|
on:action={indentListItem}
|
|
/>
|
|
</ButtonGroup>
|
|
</Item>
|
|
</ButtonDropdown>
|
|
</WithDropdown>
|
|
</ButtonGroupItem>
|
|
</DynamicallySlottable>
|
|
</ButtonGroup>
|