2021-10-18 14:01:15 +02:00
|
|
|
<!--
|
|
|
|
Copyright: Ankitects Pty Ltd and contributors
|
|
|
|
License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
|
|
-->
|
2022-02-03 05:52:11 +01:00
|
|
|
<script context="module" lang="ts">
|
|
|
|
import type { Writable } from "svelte/store";
|
2022-02-04 09:36:34 +01:00
|
|
|
|
Field redesign (#2002)
* Adjust size of legacy buttons
* Revert "Adjust size of legacy buttons"
This reverts commit fb888fe1db9050c34b1a7b0820e6da5ac91ccee6.
* Remove unused function from #1476
* Use outline version for tag icon
* Add chevron icons
* Remove code icons, keep one pin icon version
* Add code-bg color
* Redesign fields
* Remove unused import
* Fix imports
* Move PlainTextBadge between editing inputs
where it belongs :)
* Make whole separator line clickable
* Fix transition
and format
* Don't show toggle when field is collapsed
* Show toggle only on hover
for mobile I'd like to implement a swipe mechanism.
* Use tweened SVG for triangle instead of CSS hack
* Implement more obvious HTML toggle on bottom right
* Reduce field height by a few pixels
* Reduce field height by two pixels
* Show HTML toggle when PlainTextInput is active, regardless of hover/focus
* Remove RichTextBadge.svelte
* Create separate collapsed field state
this means users can collapse fields with the HTML editor open and it will stay open when the field is expanded again.
* Add slide out animation to EditingArea, RichTextInput and PlainTextInput
only for collapsing, because it is choppy on expansion (common issue with Svelte transitions).
* Fix aliasing issue on focused field corners
* Make StickyBadge feel more responsive
* Move StickyBadge closer to field border
* Adjust field gutter/margins
* Make LabelContainer sticky
to make field operations accessible on fields with a lot of content.
* Add back html icons, remove visual editor icons
* Revert "Add code-bg color"
This reverts commit 4200f354193710b3acd9bcf84b67958e200ddcdb.
* Add rich text icon, remove strikethrough code icon
* Revert PlainTextBadge to original position
* Adjust margins in FieldState
* Rename PlainTextBadge to SecondaryInputBadge
in preparation for #1987
* Run eslint and prettier
* Make whole LabelContainer clickable area for collapse/expand
* Revert "Add slide out animation to EditingArea, RichTextInput and PlainTextInput"
This reverts commit 9a2b3410d0ead37ae1da408d68e14507a058a613.
* Fix error on collapse/expansion
this was caused by the {#if} blocks, which resulted in the deletion of original EditingAreas.
* Refocus when toggling chevron and secondary input badge
* Revert "Revert "Add code-bg color""
This reverts commit 1cfd3bda65354ab90c1ab4cbbef47596a1be8754.
* Use single rotating chevron icon and make it RTL-compatible
* Remove redundant CSS transition rule
* Introduce animated Collapsible component and fix refocus on toggle
* Do not try to force repaint, as it is not required
* Remove RTL store from LabelContainer
the direction is already applied globally.
* Collapse secondary input with field
* Add focusedField to NoteEditorAPI
* Replace :global CSS selector with class .visible
thus removing the assumption that the component is used inside an EditorField.
https://github.com/ankitects/anki/pull/2002#discussion_r944876448
* Use named function syntax instead of function expressions
* Add explanation comment
* Remove unnecessary :bind directive
* Create CollapseBadge component
* Move :global selector into .plain-text-input
* Add comment explaining box-shadow pseudo-element
* Move Collapsible from EditingArea, PlainTextInput and RichTextInput into user components
* Rename SecondaryInputBadge to PlainTextBadge and remove generalization logic
I kept the rich text icon inside icons.ts for future use.
* Sort imports
* Fix background-color for duplicates not showing
with yet another pseudo-element :)
The pseudo-element that covers up field borders on scroll caused this issue. Fighting fire with fire here.
* Increase size of plain text toggle to original value again
This makes the clickable area a bit bigger and looks slightly more consistent with StickyBadge.
* Scrap pseudo-element mess in LabelContainer and tackle the actual issue
* Add class .visible to StickyBadge too
This introduces a peculiar bug: The active prop of StickyBadge resets to false when the mouse leaves the field - regardless of the actual back-end value.
* Fix sticky badge resetting on mouseleave/blur
* Apply overflow: hidden only during transition
fixes MathJax handle getting cut off by fields
* Remove unused variable
* Fix visual bug caused by overflow:hidden not applying in time
I tried several asynchronous approaches, but they all caused issues: either they prevented the CSS transition or they made field inputs lose focus.
In the end I resorted to direct, synchronous DOM-manipulation and added an explanatory comment.
* Decrease Collapsible load time by blocking first transition
I noticed the sliding animation has a hefty performance impact when a large number of fields is loaded simultaneously.
Blocking the first transition (which isn't even visible) results in a big boost in load time.
* Replace usages of gap with margins for children
* Revert unnecessary removal of grid-gap definition
* Correct comments about flex-gap property
mistook that for grid-gap.
* Resolve style issues
* Add minimum targets to gap comment
Co-authored-by: Henrik Giesel <hengiesel@gmail.com>
2022-08-19 02:02:28 +02:00
|
|
|
import Collapsible from "../components/Collapsible.svelte";
|
2022-02-03 05:52:11 +01:00
|
|
|
import type { EditingInputAPI } from "./EditingArea.svelte";
|
|
|
|
import type { EditorToolbarAPI } from "./editor-toolbar";
|
2022-02-04 09:36:34 +01:00
|
|
|
import type { EditorFieldAPI } from "./EditorField.svelte";
|
Field redesign (#2002)
* Adjust size of legacy buttons
* Revert "Adjust size of legacy buttons"
This reverts commit fb888fe1db9050c34b1a7b0820e6da5ac91ccee6.
* Remove unused function from #1476
* Use outline version for tag icon
* Add chevron icons
* Remove code icons, keep one pin icon version
* Add code-bg color
* Redesign fields
* Remove unused import
* Fix imports
* Move PlainTextBadge between editing inputs
where it belongs :)
* Make whole separator line clickable
* Fix transition
and format
* Don't show toggle when field is collapsed
* Show toggle only on hover
for mobile I'd like to implement a swipe mechanism.
* Use tweened SVG for triangle instead of CSS hack
* Implement more obvious HTML toggle on bottom right
* Reduce field height by a few pixels
* Reduce field height by two pixels
* Show HTML toggle when PlainTextInput is active, regardless of hover/focus
* Remove RichTextBadge.svelte
* Create separate collapsed field state
this means users can collapse fields with the HTML editor open and it will stay open when the field is expanded again.
* Add slide out animation to EditingArea, RichTextInput and PlainTextInput
only for collapsing, because it is choppy on expansion (common issue with Svelte transitions).
* Fix aliasing issue on focused field corners
* Make StickyBadge feel more responsive
* Move StickyBadge closer to field border
* Adjust field gutter/margins
* Make LabelContainer sticky
to make field operations accessible on fields with a lot of content.
* Add back html icons, remove visual editor icons
* Revert "Add code-bg color"
This reverts commit 4200f354193710b3acd9bcf84b67958e200ddcdb.
* Add rich text icon, remove strikethrough code icon
* Revert PlainTextBadge to original position
* Adjust margins in FieldState
* Rename PlainTextBadge to SecondaryInputBadge
in preparation for #1987
* Run eslint and prettier
* Make whole LabelContainer clickable area for collapse/expand
* Revert "Add slide out animation to EditingArea, RichTextInput and PlainTextInput"
This reverts commit 9a2b3410d0ead37ae1da408d68e14507a058a613.
* Fix error on collapse/expansion
this was caused by the {#if} blocks, which resulted in the deletion of original EditingAreas.
* Refocus when toggling chevron and secondary input badge
* Revert "Revert "Add code-bg color""
This reverts commit 1cfd3bda65354ab90c1ab4cbbef47596a1be8754.
* Use single rotating chevron icon and make it RTL-compatible
* Remove redundant CSS transition rule
* Introduce animated Collapsible component and fix refocus on toggle
* Do not try to force repaint, as it is not required
* Remove RTL store from LabelContainer
the direction is already applied globally.
* Collapse secondary input with field
* Add focusedField to NoteEditorAPI
* Replace :global CSS selector with class .visible
thus removing the assumption that the component is used inside an EditorField.
https://github.com/ankitects/anki/pull/2002#discussion_r944876448
* Use named function syntax instead of function expressions
* Add explanation comment
* Remove unnecessary :bind directive
* Create CollapseBadge component
* Move :global selector into .plain-text-input
* Add comment explaining box-shadow pseudo-element
* Move Collapsible from EditingArea, PlainTextInput and RichTextInput into user components
* Rename SecondaryInputBadge to PlainTextBadge and remove generalization logic
I kept the rich text icon inside icons.ts for future use.
* Sort imports
* Fix background-color for duplicates not showing
with yet another pseudo-element :)
The pseudo-element that covers up field borders on scroll caused this issue. Fighting fire with fire here.
* Increase size of plain text toggle to original value again
This makes the clickable area a bit bigger and looks slightly more consistent with StickyBadge.
* Scrap pseudo-element mess in LabelContainer and tackle the actual issue
* Add class .visible to StickyBadge too
This introduces a peculiar bug: The active prop of StickyBadge resets to false when the mouse leaves the field - regardless of the actual back-end value.
* Fix sticky badge resetting on mouseleave/blur
* Apply overflow: hidden only during transition
fixes MathJax handle getting cut off by fields
* Remove unused variable
* Fix visual bug caused by overflow:hidden not applying in time
I tried several asynchronous approaches, but they all caused issues: either they prevented the CSS transition or they made field inputs lose focus.
In the end I resorted to direct, synchronous DOM-manipulation and added an explanatory comment.
* Decrease Collapsible load time by blocking first transition
I noticed the sliding animation has a hefty performance impact when a large number of fields is loaded simultaneously.
Blocking the first transition (which isn't even visible) results in a big boost in load time.
* Replace usages of gap with margins for children
* Revert unnecessary removal of grid-gap definition
* Correct comments about flex-gap property
mistook that for grid-gap.
* Resolve style issues
* Add minimum targets to gap comment
Co-authored-by: Henrik Giesel <hengiesel@gmail.com>
2022-08-19 02:02:28 +02:00
|
|
|
import FieldState from "./FieldState.svelte";
|
|
|
|
import LabelContainer from "./LabelContainer.svelte";
|
|
|
|
import LabelName from "./LabelName.svelte";
|
2022-02-03 05:52:11 +01:00
|
|
|
|
|
|
|
export interface NoteEditorAPI {
|
|
|
|
fields: EditorFieldAPI[];
|
Field redesign (#2002)
* Adjust size of legacy buttons
* Revert "Adjust size of legacy buttons"
This reverts commit fb888fe1db9050c34b1a7b0820e6da5ac91ccee6.
* Remove unused function from #1476
* Use outline version for tag icon
* Add chevron icons
* Remove code icons, keep one pin icon version
* Add code-bg color
* Redesign fields
* Remove unused import
* Fix imports
* Move PlainTextBadge between editing inputs
where it belongs :)
* Make whole separator line clickable
* Fix transition
and format
* Don't show toggle when field is collapsed
* Show toggle only on hover
for mobile I'd like to implement a swipe mechanism.
* Use tweened SVG for triangle instead of CSS hack
* Implement more obvious HTML toggle on bottom right
* Reduce field height by a few pixels
* Reduce field height by two pixels
* Show HTML toggle when PlainTextInput is active, regardless of hover/focus
* Remove RichTextBadge.svelte
* Create separate collapsed field state
this means users can collapse fields with the HTML editor open and it will stay open when the field is expanded again.
* Add slide out animation to EditingArea, RichTextInput and PlainTextInput
only for collapsing, because it is choppy on expansion (common issue with Svelte transitions).
* Fix aliasing issue on focused field corners
* Make StickyBadge feel more responsive
* Move StickyBadge closer to field border
* Adjust field gutter/margins
* Make LabelContainer sticky
to make field operations accessible on fields with a lot of content.
* Add back html icons, remove visual editor icons
* Revert "Add code-bg color"
This reverts commit 4200f354193710b3acd9bcf84b67958e200ddcdb.
* Add rich text icon, remove strikethrough code icon
* Revert PlainTextBadge to original position
* Adjust margins in FieldState
* Rename PlainTextBadge to SecondaryInputBadge
in preparation for #1987
* Run eslint and prettier
* Make whole LabelContainer clickable area for collapse/expand
* Revert "Add slide out animation to EditingArea, RichTextInput and PlainTextInput"
This reverts commit 9a2b3410d0ead37ae1da408d68e14507a058a613.
* Fix error on collapse/expansion
this was caused by the {#if} blocks, which resulted in the deletion of original EditingAreas.
* Refocus when toggling chevron and secondary input badge
* Revert "Revert "Add code-bg color""
This reverts commit 1cfd3bda65354ab90c1ab4cbbef47596a1be8754.
* Use single rotating chevron icon and make it RTL-compatible
* Remove redundant CSS transition rule
* Introduce animated Collapsible component and fix refocus on toggle
* Do not try to force repaint, as it is not required
* Remove RTL store from LabelContainer
the direction is already applied globally.
* Collapse secondary input with field
* Add focusedField to NoteEditorAPI
* Replace :global CSS selector with class .visible
thus removing the assumption that the component is used inside an EditorField.
https://github.com/ankitects/anki/pull/2002#discussion_r944876448
* Use named function syntax instead of function expressions
* Add explanation comment
* Remove unnecessary :bind directive
* Create CollapseBadge component
* Move :global selector into .plain-text-input
* Add comment explaining box-shadow pseudo-element
* Move Collapsible from EditingArea, PlainTextInput and RichTextInput into user components
* Rename SecondaryInputBadge to PlainTextBadge and remove generalization logic
I kept the rich text icon inside icons.ts for future use.
* Sort imports
* Fix background-color for duplicates not showing
with yet another pseudo-element :)
The pseudo-element that covers up field borders on scroll caused this issue. Fighting fire with fire here.
* Increase size of plain text toggle to original value again
This makes the clickable area a bit bigger and looks slightly more consistent with StickyBadge.
* Scrap pseudo-element mess in LabelContainer and tackle the actual issue
* Add class .visible to StickyBadge too
This introduces a peculiar bug: The active prop of StickyBadge resets to false when the mouse leaves the field - regardless of the actual back-end value.
* Fix sticky badge resetting on mouseleave/blur
* Apply overflow: hidden only during transition
fixes MathJax handle getting cut off by fields
* Remove unused variable
* Fix visual bug caused by overflow:hidden not applying in time
I tried several asynchronous approaches, but they all caused issues: either they prevented the CSS transition or they made field inputs lose focus.
In the end I resorted to direct, synchronous DOM-manipulation and added an explanatory comment.
* Decrease Collapsible load time by blocking first transition
I noticed the sliding animation has a hefty performance impact when a large number of fields is loaded simultaneously.
Blocking the first transition (which isn't even visible) results in a big boost in load time.
* Replace usages of gap with margins for children
* Revert unnecessary removal of grid-gap definition
* Correct comments about flex-gap property
mistook that for grid-gap.
* Resolve style issues
* Add minimum targets to gap comment
Co-authored-by: Henrik Giesel <hengiesel@gmail.com>
2022-08-19 02:02:28 +02:00
|
|
|
hoveredField: Writable<EditorFieldAPI | null>;
|
2022-02-03 05:52:11 +01:00
|
|
|
focusedField: Writable<EditorFieldAPI | null>;
|
|
|
|
focusedInput: Writable<EditingInputAPI | null>;
|
|
|
|
toolbar: EditorToolbarAPI;
|
|
|
|
}
|
|
|
|
|
Move away from Bazel (#2202)
(for upgrading users, please see the notes at the bottom)
Bazel brought a lot of nice things to the table, such as rebuilds based on
content changes instead of modification times, caching of build products,
detection of incorrect build rules via a sandbox, and so on. Rewriting the build
in Bazel was also an opportunity to improve on the Makefile-based build we had
prior, which was pretty poor: most dependencies were external or not pinned, and
the build graph was poorly defined and mostly serialized. It was not uncommon
for fresh checkouts to fail due to floating dependencies, or for things to break
when trying to switch to an older commit.
For day-to-day development, I think Bazel served us reasonably well - we could
generally switch between branches while being confident that builds would be
correct and reasonably fast, and not require full rebuilds (except on Windows,
where the lack of a sandbox and the TS rules would cause build breakages when TS
files were renamed/removed).
Bazel achieves that reliability by defining rules for each programming language
that define how source files should be turned into outputs. For the rules to
work with Bazel's sandboxing approach, they often have to reimplement or
partially bypass the standard tools that each programming language provides. The
Rust rules call Rust's compiler directly for example, instead of using Cargo,
and the Python rules extract each PyPi package into a separate folder that gets
added to sys.path.
These separate language rules allow proper declaration of inputs and outputs,
and offer some advantages such as caching of build products and fine-grained
dependency installation. But they also bring some downsides:
- The rules don't always support use-cases/platforms that the standard language
tools do, meaning they need to be patched to be used. I've had to contribute a
number of patches to the Rust, Python and JS rules to unblock various issues.
- The dependencies we use with each language sometimes make assumptions that do
not hold in Bazel, meaning they either need to be pinned or patched, or the
language rules need to be adjusted to accommodate them.
I was hopeful that after the initial setup work, things would be relatively
smooth-sailing. Unfortunately, that has not proved to be the case. Things
frequently broke when dependencies or the language rules were updated, and I
began to get frustrated at the amount of Anki development time I was instead
spending on build system upkeep. It's now about 2 years since switching to
Bazel, and I think it's time to cut losses, and switch to something else that's
a better fit.
The new build system is based on a small build tool called Ninja, and some
custom Rust code in build/. This means that to build Anki, Bazel is no longer
required, but Ninja and Rust need to be installed on your system. Python and
Node toolchains are automatically downloaded like in Bazel.
This new build system should result in faster builds in some cases:
- Because we're using cargo to build now, Rust builds are able to take advantage
of pipelining and incremental debug builds, which we didn't have with Bazel.
It's also easier to override the default linker on Linux/macOS, which can
further improve speeds.
- External Rust crates are now built with opt=1, which improves performance
of debug builds.
- Esbuild is now used to transpile TypeScript, instead of invoking the TypeScript
compiler. This results in faster builds, by deferring typechecking to test/check
time, and by allowing more work to happen in parallel.
As an example of the differences, when testing with the mold linker on Linux,
adding a new message to tags.proto (which triggers a recompile of the bulk of
the Rust and TypeScript code) results in a compile that goes from about 22s on
Bazel to about 7s in the new system. With the standard linker, it's about 9s.
Some other changes of note:
- Our Rust workspace now uses cargo-hakari to ensure all packages agree on
available features, preventing unnecessary rebuilds.
- pylib/anki is now a PEP420 implicit namespace, avoiding the need to merge
source files and generated files into a single folder for running. By telling
VSCode about the extra search path, code completion now works with generated
files without needing to symlink them into the source folder.
- qt/aqt can't use PEP420 as it's difficult to get rid of aqt/__init__.py.
Instead, the generated files are now placed in a separate _aqt package that's
added to the path.
- ts/lib is now exposed as @tslib, so the source code and generated code can be
provided under the same namespace without a merging step.
- MyPy and PyLint are now invoked once for the entire codebase.
- dprint will be used to format TypeScript/json files in the future instead of
the slower prettier (currently turned off to avoid causing conflicts). It can
automatically defer to prettier when formatting Svelte files.
- svelte-check is now used for typechecking our Svelte code, which revealed a
few typing issues that went undetected with the old system.
- The Jest unit tests now work on Windows as well.
If you're upgrading from Bazel, updated usage instructions are in docs/development.md and docs/build.md. A summary of the changes:
- please remove node_modules and .bazel
- install rustup (https://rustup.rs/)
- install rsync if not already installed (on windows, use pacman - see docs/windows.md)
- install Ninja (unzip from https://github.com/ninja-build/ninja/releases/tag/v1.11.1 and
place on your path, or from your distro/homebrew if it's 1.10+)
- update .vscode/settings.json from .vscode.dist
2022-11-27 06:24:20 +01:00
|
|
|
import { registerPackage } from "@tslib/runtime-require";
|
2022-11-28 00:17:39 +01:00
|
|
|
|
2022-02-03 05:52:11 +01:00
|
|
|
import contextProperty from "../sveltelib/context-property";
|
|
|
|
import lifecycleHooks from "../sveltelib/lifecycle-hooks";
|
|
|
|
|
|
|
|
const key = Symbol("noteEditor");
|
|
|
|
const [context, setContextProperty] = contextProperty<NoteEditorAPI>(key);
|
|
|
|
const [lifecycle, instances, setupLifecycleHooks] = lifecycleHooks<NoteEditorAPI>();
|
|
|
|
|
|
|
|
export { context };
|
|
|
|
|
|
|
|
registerPackage("anki/NoteEditor", {
|
|
|
|
context,
|
|
|
|
lifecycle,
|
|
|
|
instances,
|
|
|
|
});
|
|
|
|
</script>
|
|
|
|
|
|
|
|
<script lang="ts">
|
Move away from Bazel (#2202)
(for upgrading users, please see the notes at the bottom)
Bazel brought a lot of nice things to the table, such as rebuilds based on
content changes instead of modification times, caching of build products,
detection of incorrect build rules via a sandbox, and so on. Rewriting the build
in Bazel was also an opportunity to improve on the Makefile-based build we had
prior, which was pretty poor: most dependencies were external or not pinned, and
the build graph was poorly defined and mostly serialized. It was not uncommon
for fresh checkouts to fail due to floating dependencies, or for things to break
when trying to switch to an older commit.
For day-to-day development, I think Bazel served us reasonably well - we could
generally switch between branches while being confident that builds would be
correct and reasonably fast, and not require full rebuilds (except on Windows,
where the lack of a sandbox and the TS rules would cause build breakages when TS
files were renamed/removed).
Bazel achieves that reliability by defining rules for each programming language
that define how source files should be turned into outputs. For the rules to
work with Bazel's sandboxing approach, they often have to reimplement or
partially bypass the standard tools that each programming language provides. The
Rust rules call Rust's compiler directly for example, instead of using Cargo,
and the Python rules extract each PyPi package into a separate folder that gets
added to sys.path.
These separate language rules allow proper declaration of inputs and outputs,
and offer some advantages such as caching of build products and fine-grained
dependency installation. But they also bring some downsides:
- The rules don't always support use-cases/platforms that the standard language
tools do, meaning they need to be patched to be used. I've had to contribute a
number of patches to the Rust, Python and JS rules to unblock various issues.
- The dependencies we use with each language sometimes make assumptions that do
not hold in Bazel, meaning they either need to be pinned or patched, or the
language rules need to be adjusted to accommodate them.
I was hopeful that after the initial setup work, things would be relatively
smooth-sailing. Unfortunately, that has not proved to be the case. Things
frequently broke when dependencies or the language rules were updated, and I
began to get frustrated at the amount of Anki development time I was instead
spending on build system upkeep. It's now about 2 years since switching to
Bazel, and I think it's time to cut losses, and switch to something else that's
a better fit.
The new build system is based on a small build tool called Ninja, and some
custom Rust code in build/. This means that to build Anki, Bazel is no longer
required, but Ninja and Rust need to be installed on your system. Python and
Node toolchains are automatically downloaded like in Bazel.
This new build system should result in faster builds in some cases:
- Because we're using cargo to build now, Rust builds are able to take advantage
of pipelining and incremental debug builds, which we didn't have with Bazel.
It's also easier to override the default linker on Linux/macOS, which can
further improve speeds.
- External Rust crates are now built with opt=1, which improves performance
of debug builds.
- Esbuild is now used to transpile TypeScript, instead of invoking the TypeScript
compiler. This results in faster builds, by deferring typechecking to test/check
time, and by allowing more work to happen in parallel.
As an example of the differences, when testing with the mold linker on Linux,
adding a new message to tags.proto (which triggers a recompile of the bulk of
the Rust and TypeScript code) results in a compile that goes from about 22s on
Bazel to about 7s in the new system. With the standard linker, it's about 9s.
Some other changes of note:
- Our Rust workspace now uses cargo-hakari to ensure all packages agree on
available features, preventing unnecessary rebuilds.
- pylib/anki is now a PEP420 implicit namespace, avoiding the need to merge
source files and generated files into a single folder for running. By telling
VSCode about the extra search path, code completion now works with generated
files without needing to symlink them into the source folder.
- qt/aqt can't use PEP420 as it's difficult to get rid of aqt/__init__.py.
Instead, the generated files are now placed in a separate _aqt package that's
added to the path.
- ts/lib is now exposed as @tslib, so the source code and generated code can be
provided under the same namespace without a merging step.
- MyPy and PyLint are now invoked once for the entire codebase.
- dprint will be used to format TypeScript/json files in the future instead of
the slower prettier (currently turned off to avoid causing conflicts). It can
automatically defer to prettier when formatting Svelte files.
- svelte-check is now used for typechecking our Svelte code, which revealed a
few typing issues that went undetected with the old system.
- The Jest unit tests now work on Windows as well.
If you're upgrading from Bazel, updated usage instructions are in docs/development.md and docs/build.md. A summary of the changes:
- please remove node_modules and .bazel
- install rustup (https://rustup.rs/)
- install rsync if not already installed (on windows, use pacman - see docs/windows.md)
- install Ninja (unzip from https://github.com/ninja-build/ninja/releases/tag/v1.11.1 and
place on your path, or from your distro/homebrew if it's 1.10+)
- update .vscode/settings.json from .vscode.dist
2022-11-27 06:24:20 +01:00
|
|
|
import { bridgeCommand } from "@tslib/bridgecommand";
|
|
|
|
import * as tr from "@tslib/ftl";
|
2023-10-22 02:40:40 +02:00
|
|
|
import { type ImageLoadedEvent, resetIOImage } from "image-occlusion/mask-editor";
|
2022-02-05 06:58:31 +01:00
|
|
|
import { onMount, tick } from "svelte";
|
2022-02-04 09:36:34 +01:00
|
|
|
import { get, writable } from "svelte/store";
|
2022-11-28 00:17:39 +01:00
|
|
|
|
2022-02-03 05:52:11 +01:00
|
|
|
import Absolute from "../components/Absolute.svelte";
|
|
|
|
import Badge from "../components/Badge.svelte";
|
2022-06-01 12:26:16 +02:00
|
|
|
import { TagEditor } from "../tag-editor";
|
2023-03-16 07:48:29 +01:00
|
|
|
import { commitTagEdits } from "../tag-editor/TagInput.svelte";
|
2022-02-04 09:36:34 +01:00
|
|
|
import { ChangeTimer } from "./change-timer";
|
|
|
|
import { clearableArray } from "./destroyable";
|
|
|
|
import DuplicateLink from "./DuplicateLink.svelte";
|
2022-08-15 05:34:16 +02:00
|
|
|
import EditorToolbar from "./editor-toolbar";
|
2022-02-04 09:36:34 +01:00
|
|
|
import type { FieldData } from "./EditorField.svelte";
|
|
|
|
import EditorField from "./EditorField.svelte";
|
|
|
|
import Fields from "./Fields.svelte";
|
|
|
|
import { alertIcon } from "./icons";
|
2022-10-27 01:11:36 +02:00
|
|
|
import ImageOverlay from "./image-overlay";
|
2022-09-26 01:47:50 +02:00
|
|
|
import { shrinkImagesByDefault } from "./image-overlay/ImageOverlay.svelte";
|
2022-10-27 01:11:36 +02:00
|
|
|
import MathjaxOverlay from "./mathjax-overlay";
|
2023-06-19 05:55:40 +02:00
|
|
|
import { closeMathjaxEditor } from "./mathjax-overlay/MathjaxEditor.svelte";
|
2022-02-04 09:36:34 +01:00
|
|
|
import Notification from "./Notification.svelte";
|
2022-08-15 05:34:16 +02:00
|
|
|
import PlainTextInput from "./plain-text-input";
|
2022-10-03 05:14:57 +02:00
|
|
|
import { closeHTMLTags } from "./plain-text-input/PlainTextInput.svelte";
|
2022-02-03 05:52:11 +01:00
|
|
|
import PlainTextBadge from "./PlainTextBadge.svelte";
|
2022-08-15 05:34:16 +02:00
|
|
|
import RichTextInput, { editingInputIsRichText } from "./rich-text-input";
|
2022-08-31 15:34:39 +02:00
|
|
|
import RichTextBadge from "./RichTextBadge.svelte";
|
2023-06-14 01:38:06 +02:00
|
|
|
import type { NotetypeIdAndModTime, SessionOptions } from "./types";
|
2023-10-13 00:47:50 +02:00
|
|
|
import { EditorState } from "./types";
|
2022-02-03 05:52:11 +01:00
|
|
|
|
|
|
|
function quoteFontFamily(fontFamily: string): string {
|
|
|
|
// generic families (e.g. sans-serif) must not be quoted
|
|
|
|
if (!/^[-a-z]+$/.test(fontFamily)) {
|
|
|
|
fontFamily = `"${fontFamily}"`;
|
|
|
|
}
|
|
|
|
return fontFamily;
|
|
|
|
}
|
|
|
|
|
2022-11-23 07:50:15 +01:00
|
|
|
const size = 1.6;
|
2022-02-04 09:36:34 +01:00
|
|
|
const wrap = true;
|
2022-02-03 05:52:11 +01:00
|
|
|
|
2022-12-07 06:37:46 +01:00
|
|
|
const sessionOptions: SessionOptions = {};
|
|
|
|
export function saveSession(): void {
|
2023-06-14 01:38:06 +02:00
|
|
|
if (notetypeMeta) {
|
|
|
|
sessionOptions[notetypeMeta.id] = {
|
2022-12-07 06:37:46 +01:00
|
|
|
fieldsCollapsed,
|
|
|
|
fieldStates: {
|
|
|
|
richTextsHidden,
|
|
|
|
plainTextsHidden,
|
|
|
|
plainTextDefaults,
|
|
|
|
},
|
2023-06-14 01:38:06 +02:00
|
|
|
modTimeOfNotetype: notetypeMeta.modTime,
|
2022-12-07 06:37:46 +01:00
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-04 09:36:34 +01:00
|
|
|
const fieldStores: Writable<string>[] = [];
|
2022-02-03 05:52:11 +01:00
|
|
|
let fieldNames: string[] = [];
|
|
|
|
export function setFields(fs: [string, string][]): void {
|
|
|
|
// this is a bit of a mess -- when moving to Rust calls, we should make
|
|
|
|
// sure to have two backend endpoints for:
|
|
|
|
// * the note, which can be set through this view
|
|
|
|
// * the fieldname, font, etc., which cannot be set
|
|
|
|
|
|
|
|
const newFieldNames: string[] = [];
|
|
|
|
|
|
|
|
for (const [index, [fieldName]] of fs.entries()) {
|
|
|
|
newFieldNames[index] = fieldName;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (let i = fieldStores.length; i < newFieldNames.length; i++) {
|
|
|
|
const newStore = writable("");
|
|
|
|
fieldStores[i] = newStore;
|
|
|
|
newStore.subscribe((value) => updateField(i, value));
|
|
|
|
}
|
|
|
|
|
|
|
|
for (
|
|
|
|
let i = fieldStores.length;
|
|
|
|
i > newFieldNames.length;
|
|
|
|
i = fieldStores.length
|
|
|
|
) {
|
|
|
|
fieldStores.pop();
|
|
|
|
}
|
|
|
|
|
2022-02-04 09:36:34 +01:00
|
|
|
for (const [index, [, fieldContent]] of fs.entries()) {
|
2022-02-03 05:52:11 +01:00
|
|
|
fieldStores[index].set(fieldContent);
|
|
|
|
}
|
|
|
|
|
|
|
|
fieldNames = newFieldNames;
|
|
|
|
}
|
|
|
|
|
2022-08-31 15:34:39 +02:00
|
|
|
let fieldsCollapsed: boolean[] = [];
|
2022-12-07 06:37:46 +01:00
|
|
|
export function setCollapsed(defaultCollapsed: boolean[]): void {
|
2023-03-08 10:22:02 +01:00
|
|
|
fieldsCollapsed =
|
2023-06-14 01:38:06 +02:00
|
|
|
sessionOptions[notetypeMeta?.id]?.fieldsCollapsed ?? defaultCollapsed;
|
2022-08-31 15:34:39 +02:00
|
|
|
}
|
|
|
|
|
2022-08-18 04:30:18 +02:00
|
|
|
let richTextsHidden: boolean[] = [];
|
|
|
|
let plainTextsHidden: boolean[] = [];
|
2022-08-31 15:34:39 +02:00
|
|
|
let plainTextDefaults: boolean[] = [];
|
2022-08-18 04:30:18 +02:00
|
|
|
|
2022-12-07 06:37:46 +01:00
|
|
|
export function setPlainTexts(defaultPlainTexts: boolean[]): void {
|
2023-06-14 01:38:06 +02:00
|
|
|
const states = sessionOptions[notetypeMeta?.id]?.fieldStates;
|
2023-03-08 10:22:02 +01:00
|
|
|
if (states) {
|
|
|
|
richTextsHidden = states.richTextsHidden;
|
|
|
|
plainTextsHidden = states.plainTextsHidden;
|
|
|
|
plainTextDefaults = states.plainTextDefaults;
|
|
|
|
} else {
|
|
|
|
plainTextDefaults = defaultPlainTexts;
|
|
|
|
richTextsHidden = [...defaultPlainTexts];
|
|
|
|
plainTextsHidden = Array.from(defaultPlainTexts, (v) => !v);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
export function triggerChanges(): void {
|
|
|
|
// I know this looks quite weird and doesn't seem to do anything
|
|
|
|
// but if we don't call this after setPlainTexts() and setCollapsed()
|
|
|
|
// when switching notetypes, existing collapsibles won't react
|
|
|
|
// automatically to the updated props
|
2023-02-27 07:49:48 +01:00
|
|
|
tick().then(() => {
|
2023-03-08 10:22:02 +01:00
|
|
|
fieldsCollapsed = fieldsCollapsed;
|
|
|
|
plainTextDefaults = plainTextDefaults;
|
|
|
|
richTextsHidden = richTextsHidden;
|
|
|
|
plainTextsHidden = plainTextsHidden;
|
2023-02-27 07:49:48 +01:00
|
|
|
});
|
2022-08-18 04:30:18 +02:00
|
|
|
}
|
|
|
|
|
2022-08-18 04:06:06 +02:00
|
|
|
function setMathjaxEnabled(enabled: boolean): void {
|
|
|
|
mathjaxConfig.enabled = enabled;
|
|
|
|
}
|
|
|
|
|
2022-02-03 05:52:11 +01:00
|
|
|
let fieldDescriptions: string[] = [];
|
2022-12-07 06:37:46 +01:00
|
|
|
export function setDescriptions(descriptions: string[]): void {
|
2023-01-13 07:37:49 +01:00
|
|
|
fieldDescriptions = descriptions.map((d) =>
|
|
|
|
d.replace(/\\/g, "").replace(/"/g, '\\"'),
|
|
|
|
);
|
2022-02-03 05:52:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
let fonts: [string, number, boolean][] = [];
|
Field redesign (#2002)
* Adjust size of legacy buttons
* Revert "Adjust size of legacy buttons"
This reverts commit fb888fe1db9050c34b1a7b0820e6da5ac91ccee6.
* Remove unused function from #1476
* Use outline version for tag icon
* Add chevron icons
* Remove code icons, keep one pin icon version
* Add code-bg color
* Redesign fields
* Remove unused import
* Fix imports
* Move PlainTextBadge between editing inputs
where it belongs :)
* Make whole separator line clickable
* Fix transition
and format
* Don't show toggle when field is collapsed
* Show toggle only on hover
for mobile I'd like to implement a swipe mechanism.
* Use tweened SVG for triangle instead of CSS hack
* Implement more obvious HTML toggle on bottom right
* Reduce field height by a few pixels
* Reduce field height by two pixels
* Show HTML toggle when PlainTextInput is active, regardless of hover/focus
* Remove RichTextBadge.svelte
* Create separate collapsed field state
this means users can collapse fields with the HTML editor open and it will stay open when the field is expanded again.
* Add slide out animation to EditingArea, RichTextInput and PlainTextInput
only for collapsing, because it is choppy on expansion (common issue with Svelte transitions).
* Fix aliasing issue on focused field corners
* Make StickyBadge feel more responsive
* Move StickyBadge closer to field border
* Adjust field gutter/margins
* Make LabelContainer sticky
to make field operations accessible on fields with a lot of content.
* Add back html icons, remove visual editor icons
* Revert "Add code-bg color"
This reverts commit 4200f354193710b3acd9bcf84b67958e200ddcdb.
* Add rich text icon, remove strikethrough code icon
* Revert PlainTextBadge to original position
* Adjust margins in FieldState
* Rename PlainTextBadge to SecondaryInputBadge
in preparation for #1987
* Run eslint and prettier
* Make whole LabelContainer clickable area for collapse/expand
* Revert "Add slide out animation to EditingArea, RichTextInput and PlainTextInput"
This reverts commit 9a2b3410d0ead37ae1da408d68e14507a058a613.
* Fix error on collapse/expansion
this was caused by the {#if} blocks, which resulted in the deletion of original EditingAreas.
* Refocus when toggling chevron and secondary input badge
* Revert "Revert "Add code-bg color""
This reverts commit 1cfd3bda65354ab90c1ab4cbbef47596a1be8754.
* Use single rotating chevron icon and make it RTL-compatible
* Remove redundant CSS transition rule
* Introduce animated Collapsible component and fix refocus on toggle
* Do not try to force repaint, as it is not required
* Remove RTL store from LabelContainer
the direction is already applied globally.
* Collapse secondary input with field
* Add focusedField to NoteEditorAPI
* Replace :global CSS selector with class .visible
thus removing the assumption that the component is used inside an EditorField.
https://github.com/ankitects/anki/pull/2002#discussion_r944876448
* Use named function syntax instead of function expressions
* Add explanation comment
* Remove unnecessary :bind directive
* Create CollapseBadge component
* Move :global selector into .plain-text-input
* Add comment explaining box-shadow pseudo-element
* Move Collapsible from EditingArea, PlainTextInput and RichTextInput into user components
* Rename SecondaryInputBadge to PlainTextBadge and remove generalization logic
I kept the rich text icon inside icons.ts for future use.
* Sort imports
* Fix background-color for duplicates not showing
with yet another pseudo-element :)
The pseudo-element that covers up field borders on scroll caused this issue. Fighting fire with fire here.
* Increase size of plain text toggle to original value again
This makes the clickable area a bit bigger and looks slightly more consistent with StickyBadge.
* Scrap pseudo-element mess in LabelContainer and tackle the actual issue
* Add class .visible to StickyBadge too
This introduces a peculiar bug: The active prop of StickyBadge resets to false when the mouse leaves the field - regardless of the actual back-end value.
* Fix sticky badge resetting on mouseleave/blur
* Apply overflow: hidden only during transition
fixes MathJax handle getting cut off by fields
* Remove unused variable
* Fix visual bug caused by overflow:hidden not applying in time
I tried several asynchronous approaches, but they all caused issues: either they prevented the CSS transition or they made field inputs lose focus.
In the end I resorted to direct, synchronous DOM-manipulation and added an explanatory comment.
* Decrease Collapsible load time by blocking first transition
I noticed the sliding animation has a hefty performance impact when a large number of fields is loaded simultaneously.
Blocking the first transition (which isn't even visible) results in a big boost in load time.
* Replace usages of gap with margins for children
* Revert unnecessary removal of grid-gap definition
* Correct comments about flex-gap property
mistook that for grid-gap.
* Resolve style issues
* Add minimum targets to gap comment
Co-authored-by: Henrik Giesel <hengiesel@gmail.com>
2022-08-19 02:02:28 +02:00
|
|
|
|
2022-02-04 09:36:34 +01:00
|
|
|
const fields = clearableArray<EditorFieldAPI>();
|
2022-02-03 05:52:11 +01:00
|
|
|
|
|
|
|
export function setFonts(fs: [string, number, boolean][]): void {
|
|
|
|
fonts = fs;
|
|
|
|
}
|
|
|
|
|
2022-02-05 06:58:31 +01:00
|
|
|
export function focusField(index: number | null): void {
|
2023-03-08 10:22:02 +01:00
|
|
|
tick().then(() => {
|
2022-02-05 06:58:31 +01:00
|
|
|
if (typeof index === "number") {
|
|
|
|
if (!(index in fields)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
fields[index].editingArea?.refocus();
|
|
|
|
} else {
|
|
|
|
$focusedInput?.refocus();
|
|
|
|
}
|
|
|
|
});
|
2022-02-03 05:52:11 +01:00
|
|
|
}
|
|
|
|
|
2022-02-04 09:36:34 +01:00
|
|
|
const tags = writable<string[]>([]);
|
2022-02-03 05:52:11 +01:00
|
|
|
export function setTags(ts: string[]): void {
|
|
|
|
$tags = ts;
|
|
|
|
}
|
|
|
|
|
2022-09-28 06:02:32 +02:00
|
|
|
const tagsCollapsed = writable<boolean>();
|
|
|
|
export function setTagsCollapsed(collapsed: boolean): void {
|
|
|
|
$tagsCollapsed = collapsed;
|
2023-02-27 07:23:19 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
function updateTagsCollapsed(collapsed: boolean) {
|
|
|
|
$tagsCollapsed = collapsed;
|
|
|
|
bridgeCommand(`setTagsCollapsed:${$tagsCollapsed}`);
|
2022-09-28 06:02:32 +02:00
|
|
|
}
|
|
|
|
|
2022-02-03 05:52:11 +01:00
|
|
|
let noteId: number | null = null;
|
|
|
|
export function setNoteId(ntid: number): void {
|
2022-02-04 09:40:50 +01:00
|
|
|
// TODO this is a hack, because it requires the NoteEditor to know implementation details of the PlainTextInput.
|
|
|
|
// It should be refactored once we work on our own Undo stack
|
|
|
|
for (const pi of plainTextInputs) {
|
2022-02-25 02:14:26 +01:00
|
|
|
pi.api.codeMirror.editor.then((editor) => editor.clearHistory());
|
2022-02-04 09:40:50 +01:00
|
|
|
}
|
2022-02-03 05:52:11 +01:00
|
|
|
noteId = ntid;
|
|
|
|
}
|
|
|
|
|
2023-06-14 01:38:06 +02:00
|
|
|
let notetypeMeta: NotetypeIdAndModTime;
|
|
|
|
function setNotetypeMeta({ id, modTime }: NotetypeIdAndModTime): void {
|
|
|
|
notetypeMeta = { id, modTime };
|
|
|
|
// Discard the saved state of the fields if the notetype has been modified.
|
|
|
|
if (sessionOptions[id]?.modTimeOfNotetype !== modTime) {
|
|
|
|
delete sessionOptions[id];
|
|
|
|
}
|
2022-12-07 06:37:46 +01:00
|
|
|
}
|
|
|
|
|
2022-02-03 05:52:11 +01:00
|
|
|
function getNoteId(): number | null {
|
|
|
|
return noteId;
|
|
|
|
}
|
|
|
|
|
2023-07-27 14:45:49 +02:00
|
|
|
let isImageOcclusion = false;
|
|
|
|
function setIsImageOcclusion(val: boolean) {
|
|
|
|
isImageOcclusion = val;
|
|
|
|
$ioMaskEditorVisible = val;
|
|
|
|
}
|
|
|
|
|
2022-02-03 05:52:11 +01:00
|
|
|
let cols: ("dupe" | "")[] = [];
|
|
|
|
export function setBackgrounds(cls: ("dupe" | "")[]): void {
|
|
|
|
cols = cls;
|
|
|
|
}
|
|
|
|
|
|
|
|
let hint: string = "";
|
|
|
|
export function setClozeHint(hnt: string): void {
|
|
|
|
hint = hnt;
|
|
|
|
}
|
|
|
|
|
|
|
|
$: fieldsData = fieldNames.map((name, index) => ({
|
|
|
|
name,
|
2022-08-31 15:34:39 +02:00
|
|
|
plainText: plainTextDefaults[index],
|
2022-02-03 05:52:11 +01:00
|
|
|
description: fieldDescriptions[index],
|
|
|
|
fontFamily: quoteFontFamily(fonts[index][0]),
|
|
|
|
fontSize: fonts[index][1],
|
|
|
|
direction: fonts[index][2] ? "rtl" : "ltr",
|
2022-08-31 15:34:39 +02:00
|
|
|
collapsed: fieldsCollapsed[index],
|
2023-09-17 07:21:20 +02:00
|
|
|
hidden: hideFieldInOcclusionType(index, ioFields),
|
2022-02-03 05:52:11 +01:00
|
|
|
})) as FieldData[];
|
|
|
|
|
|
|
|
function saveTags({ detail }: CustomEvent): void {
|
2022-09-28 06:02:32 +02:00
|
|
|
tagAmount = detail.tags.filter((tag: string) => tag != "").length;
|
2022-02-03 05:52:11 +01:00
|
|
|
bridgeCommand(`saveTags:${JSON.stringify(detail.tags)}`);
|
|
|
|
}
|
|
|
|
|
|
|
|
const fieldSave = new ChangeTimer();
|
|
|
|
|
2022-09-26 01:47:50 +02:00
|
|
|
function transformContentBeforeSave(content: string): string {
|
|
|
|
return content.replace(/ data-editor-shrink="(true|false)"/g, "");
|
|
|
|
}
|
|
|
|
|
2022-02-03 05:52:11 +01:00
|
|
|
function updateField(index: number, content: string): void {
|
|
|
|
fieldSave.schedule(
|
2022-09-26 01:47:50 +02:00
|
|
|
() =>
|
|
|
|
bridgeCommand(
|
|
|
|
`key:${index}:${getNoteId()}:${transformContentBeforeSave(
|
|
|
|
content,
|
|
|
|
)}`,
|
|
|
|
),
|
2022-02-03 05:52:11 +01:00
|
|
|
600,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2023-03-16 07:48:29 +01:00
|
|
|
function saveFieldNow(): void {
|
2022-02-03 05:52:11 +01:00
|
|
|
/* this will always be a key save */
|
|
|
|
fieldSave.fireImmediately();
|
|
|
|
}
|
|
|
|
|
2023-03-16 07:48:29 +01:00
|
|
|
function saveNow(): void {
|
2023-06-19 05:55:40 +02:00
|
|
|
closeMathjaxEditor?.();
|
2023-03-28 06:13:21 +02:00
|
|
|
$commitTagEdits();
|
2023-03-16 07:48:29 +01:00
|
|
|
saveFieldNow();
|
|
|
|
}
|
|
|
|
|
2022-02-03 05:52:11 +01:00
|
|
|
export function saveOnPageHide() {
|
|
|
|
if (document.visibilityState === "hidden") {
|
|
|
|
// will fire on session close and minimize
|
|
|
|
saveFieldNow();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
export function focusIfField(x: number, y: number): boolean {
|
|
|
|
const elements = document.elementsFromPoint(x, y);
|
|
|
|
const first = elements[0];
|
|
|
|
|
|
|
|
if (first.shadowRoot) {
|
|
|
|
const richTextInput = first.shadowRoot.lastElementChild! as HTMLElement;
|
|
|
|
richTextInput.focus();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
let richTextInputs: RichTextInput[] = [];
|
|
|
|
$: richTextInputs = richTextInputs.filter(Boolean);
|
|
|
|
|
|
|
|
let plainTextInputs: PlainTextInput[] = [];
|
|
|
|
$: plainTextInputs = plainTextInputs.filter(Boolean);
|
|
|
|
|
2023-04-22 08:08:25 +02:00
|
|
|
function toggleRichTextInput(index: number): void {
|
|
|
|
const hidden = !richTextsHidden[index];
|
|
|
|
richTextInputs[index].focusFlag.setFlag(!hidden);
|
|
|
|
richTextsHidden[index] = hidden;
|
|
|
|
if (hidden) {
|
|
|
|
plainTextInputs[index].api.refocus();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function togglePlainTextInput(index: number): void {
|
|
|
|
const hidden = !plainTextsHidden[index];
|
|
|
|
plainTextInputs[index].focusFlag.setFlag(!hidden);
|
|
|
|
plainTextsHidden[index] = hidden;
|
|
|
|
if (hidden) {
|
|
|
|
richTextInputs[index].api.refocus();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function toggleField(index: number): void {
|
|
|
|
const collapsed = !fieldsCollapsed[index];
|
|
|
|
fieldsCollapsed[index] = collapsed;
|
|
|
|
|
|
|
|
const defaultInput = !plainTextDefaults[index]
|
|
|
|
? richTextInputs[index]
|
|
|
|
: plainTextInputs[index];
|
|
|
|
|
|
|
|
if (!collapsed) {
|
|
|
|
defaultInput.api.refocus();
|
|
|
|
} else if (!plainTextDefaults[index]) {
|
|
|
|
plainTextsHidden[index] = true;
|
|
|
|
} else {
|
|
|
|
richTextsHidden[index] = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-04 09:36:34 +01:00
|
|
|
const toolbar: Partial<EditorToolbarAPI> = {};
|
2022-02-03 05:52:11 +01:00
|
|
|
|
2022-09-26 01:47:50 +02:00
|
|
|
function setShrinkImages(shrinkByDefault: boolean) {
|
|
|
|
$shrinkImagesByDefault = shrinkByDefault;
|
|
|
|
}
|
|
|
|
|
2022-10-03 05:14:57 +02:00
|
|
|
function setCloseHTMLTags(closeTags: boolean) {
|
|
|
|
$closeHTMLTags = closeTags;
|
|
|
|
}
|
|
|
|
|
2023-06-05 04:44:28 +02:00
|
|
|
/**
|
|
|
|
* Enable/Disable add-on buttons that do not have the `perm` class
|
|
|
|
*/
|
|
|
|
function setAddonButtonsDisabled(disabled: boolean): void {
|
|
|
|
document.querySelectorAll("button.linkb:not(.perm)").forEach((button) => {
|
|
|
|
(button as HTMLButtonElement).disabled = disabled;
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2023-09-17 07:21:20 +02:00
|
|
|
import { ImageOcclusionFieldIndexes } from "@tslib/anki/image_occlusion_pb";
|
|
|
|
import { getImageOcclusionFields } from "@tslib/backend";
|
Move away from Bazel (#2202)
(for upgrading users, please see the notes at the bottom)
Bazel brought a lot of nice things to the table, such as rebuilds based on
content changes instead of modification times, caching of build products,
detection of incorrect build rules via a sandbox, and so on. Rewriting the build
in Bazel was also an opportunity to improve on the Makefile-based build we had
prior, which was pretty poor: most dependencies were external or not pinned, and
the build graph was poorly defined and mostly serialized. It was not uncommon
for fresh checkouts to fail due to floating dependencies, or for things to break
when trying to switch to an older commit.
For day-to-day development, I think Bazel served us reasonably well - we could
generally switch between branches while being confident that builds would be
correct and reasonably fast, and not require full rebuilds (except on Windows,
where the lack of a sandbox and the TS rules would cause build breakages when TS
files were renamed/removed).
Bazel achieves that reliability by defining rules for each programming language
that define how source files should be turned into outputs. For the rules to
work with Bazel's sandboxing approach, they often have to reimplement or
partially bypass the standard tools that each programming language provides. The
Rust rules call Rust's compiler directly for example, instead of using Cargo,
and the Python rules extract each PyPi package into a separate folder that gets
added to sys.path.
These separate language rules allow proper declaration of inputs and outputs,
and offer some advantages such as caching of build products and fine-grained
dependency installation. But they also bring some downsides:
- The rules don't always support use-cases/platforms that the standard language
tools do, meaning they need to be patched to be used. I've had to contribute a
number of patches to the Rust, Python and JS rules to unblock various issues.
- The dependencies we use with each language sometimes make assumptions that do
not hold in Bazel, meaning they either need to be pinned or patched, or the
language rules need to be adjusted to accommodate them.
I was hopeful that after the initial setup work, things would be relatively
smooth-sailing. Unfortunately, that has not proved to be the case. Things
frequently broke when dependencies or the language rules were updated, and I
began to get frustrated at the amount of Anki development time I was instead
spending on build system upkeep. It's now about 2 years since switching to
Bazel, and I think it's time to cut losses, and switch to something else that's
a better fit.
The new build system is based on a small build tool called Ninja, and some
custom Rust code in build/. This means that to build Anki, Bazel is no longer
required, but Ninja and Rust need to be installed on your system. Python and
Node toolchains are automatically downloaded like in Bazel.
This new build system should result in faster builds in some cases:
- Because we're using cargo to build now, Rust builds are able to take advantage
of pipelining and incremental debug builds, which we didn't have with Bazel.
It's also easier to override the default linker on Linux/macOS, which can
further improve speeds.
- External Rust crates are now built with opt=1, which improves performance
of debug builds.
- Esbuild is now used to transpile TypeScript, instead of invoking the TypeScript
compiler. This results in faster builds, by deferring typechecking to test/check
time, and by allowing more work to happen in parallel.
As an example of the differences, when testing with the mold linker on Linux,
adding a new message to tags.proto (which triggers a recompile of the bulk of
the Rust and TypeScript code) results in a compile that goes from about 22s on
Bazel to about 7s in the new system. With the standard linker, it's about 9s.
Some other changes of note:
- Our Rust workspace now uses cargo-hakari to ensure all packages agree on
available features, preventing unnecessary rebuilds.
- pylib/anki is now a PEP420 implicit namespace, avoiding the need to merge
source files and generated files into a single folder for running. By telling
VSCode about the extra search path, code completion now works with generated
files without needing to symlink them into the source folder.
- qt/aqt can't use PEP420 as it's difficult to get rid of aqt/__init__.py.
Instead, the generated files are now placed in a separate _aqt package that's
added to the path.
- ts/lib is now exposed as @tslib, so the source code and generated code can be
provided under the same namespace without a merging step.
- MyPy and PyLint are now invoked once for the entire codebase.
- dprint will be used to format TypeScript/json files in the future instead of
the slower prettier (currently turned off to avoid causing conflicts). It can
automatically defer to prettier when formatting Svelte files.
- svelte-check is now used for typechecking our Svelte code, which revealed a
few typing issues that went undetected with the old system.
- The Jest unit tests now work on Windows as well.
If you're upgrading from Bazel, updated usage instructions are in docs/development.md and docs/build.md. A summary of the changes:
- please remove node_modules and .bazel
- install rustup (https://rustup.rs/)
- install rsync if not already installed (on windows, use pacman - see docs/windows.md)
- install Ninja (unzip from https://github.com/ninja-build/ninja/releases/tag/v1.11.1 and
place on your path, or from your distro/homebrew if it's 1.10+)
- update .vscode/settings.json from .vscode.dist
2022-11-27 06:24:20 +01:00
|
|
|
import { wrapInternal } from "@tslib/wrap";
|
2023-02-27 07:23:19 +01:00
|
|
|
import Shortcut from "components/Shortcut.svelte";
|
2023-07-27 14:45:49 +02:00
|
|
|
import ImageOcclusionPage from "image-occlusion/ImageOcclusionPage.svelte";
|
2023-10-10 05:26:20 +02:00
|
|
|
import ImageOcclusionPicker from "image-occlusion/ImageOcclusionPicker.svelte";
|
2023-07-27 14:45:49 +02:00
|
|
|
import type { IOMode } from "image-occlusion/lib";
|
|
|
|
import { exportShapesToClozeDeletions } from "image-occlusion/shapes/to-cloze";
|
2023-11-24 05:06:40 +01:00
|
|
|
import {
|
|
|
|
hideAllGuessOne,
|
|
|
|
ioImageLoadedStore,
|
|
|
|
ioMaskEditorVisible,
|
|
|
|
} from "image-occlusion/store";
|
2022-11-28 00:17:39 +01:00
|
|
|
|
2022-08-18 04:06:06 +02:00
|
|
|
import { mathjaxConfig } from "../editable/mathjax-element";
|
2023-02-27 07:23:19 +01:00
|
|
|
import CollapseLabel from "./CollapseLabel.svelte";
|
2022-02-03 05:52:11 +01:00
|
|
|
import * as oldEditorAdapter from "./old-editor-adapter";
|
|
|
|
|
2023-11-24 05:06:40 +01:00
|
|
|
$: isIOImageLoaded = false;
|
|
|
|
$: ioImageLoadedStore.set(isIOImageLoaded);
|
2023-07-27 14:45:49 +02:00
|
|
|
let imageOcclusionMode: IOMode | undefined;
|
2023-09-17 07:21:20 +02:00
|
|
|
let ioFields = new ImageOcclusionFieldIndexes({});
|
2023-10-10 05:26:20 +02:00
|
|
|
|
|
|
|
function pickIOImage() {
|
|
|
|
imageOcclusionMode = undefined;
|
|
|
|
bridgeCommand("addImageForOcclusion");
|
|
|
|
}
|
|
|
|
|
|
|
|
function pickIOImageFromClipboard() {
|
|
|
|
imageOcclusionMode = undefined;
|
|
|
|
bridgeCommand("addImageForOcclusionFromClipboard");
|
|
|
|
}
|
|
|
|
|
2023-07-27 14:45:49 +02:00
|
|
|
async function setupMaskEditor(options: { html: string; mode: IOMode }) {
|
2023-09-17 03:49:30 +02:00
|
|
|
imageOcclusionMode = undefined;
|
2023-09-17 07:21:20 +02:00
|
|
|
const getIoFields = getImageOcclusionFields({
|
|
|
|
notetypeId: BigInt(notetypeMeta.id),
|
|
|
|
}).then((r) => (ioFields = r.fields!));
|
|
|
|
await Promise.all([tick(), getIoFields]);
|
2023-07-27 14:45:49 +02:00
|
|
|
imageOcclusionMode = options.mode;
|
|
|
|
if (options.mode.kind === "add") {
|
2023-09-17 07:21:20 +02:00
|
|
|
fieldStores[ioFields.image].set(options.html);
|
2023-08-15 23:47:46 +02:00
|
|
|
|
|
|
|
// new image is being added
|
|
|
|
if (isIOImageLoaded) {
|
2023-10-22 02:40:40 +02:00
|
|
|
resetIOImage(options.mode.imagePath, (event: ImageLoadedEvent) =>
|
|
|
|
onImageLoaded(
|
|
|
|
new CustomEvent("image-loaded", {
|
|
|
|
detail: event,
|
|
|
|
}),
|
|
|
|
),
|
|
|
|
);
|
2023-08-15 23:47:46 +02:00
|
|
|
}
|
2023-07-31 06:24:26 +02:00
|
|
|
} else {
|
2023-09-17 07:21:20 +02:00
|
|
|
const clozeNote = get(fieldStores[ioFields.occlusions]);
|
2023-07-31 06:24:26 +02:00
|
|
|
if (clozeNote.includes("oi=1")) {
|
|
|
|
$hideAllGuessOne = true;
|
|
|
|
} else {
|
|
|
|
$hideAllGuessOne = false;
|
|
|
|
}
|
2023-07-27 14:45:49 +02:00
|
|
|
}
|
2023-07-31 06:24:26 +02:00
|
|
|
|
2023-07-27 14:45:49 +02:00
|
|
|
isIOImageLoaded = true;
|
|
|
|
}
|
|
|
|
|
2023-07-31 06:24:26 +02:00
|
|
|
function setImageField(html) {
|
2023-09-17 07:21:20 +02:00
|
|
|
fieldStores[ioFields.image].set(html);
|
2023-07-31 06:24:26 +02:00
|
|
|
}
|
|
|
|
globalThis.setImageField = setImageField;
|
|
|
|
|
2023-10-23 01:12:56 +02:00
|
|
|
function updateOcclusionsField(): void {
|
2023-07-31 06:24:26 +02:00
|
|
|
if (isImageOcclusion) {
|
|
|
|
const occlusionsData = exportShapesToClozeDeletions($hideAllGuessOne);
|
2023-09-17 07:21:20 +02:00
|
|
|
fieldStores[ioFields.occlusions].set(occlusionsData.clozes);
|
2023-07-31 06:24:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-27 14:45:49 +02:00
|
|
|
// reset for new occlusion in add mode
|
|
|
|
function resetIOImageLoaded() {
|
|
|
|
isIOImageLoaded = false;
|
|
|
|
globalThis.canvas.clear();
|
2023-11-24 05:06:40 +01:00
|
|
|
globalThis.canvas = undefined;
|
2023-07-27 14:45:49 +02:00
|
|
|
const page = document.querySelector(".image-occlusion");
|
|
|
|
if (page) {
|
|
|
|
page.remove();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
globalThis.resetIOImageLoaded = resetIOImageLoaded;
|
|
|
|
|
2023-09-17 07:21:20 +02:00
|
|
|
/** hide occlusions and image */
|
|
|
|
function hideFieldInOcclusionType(
|
|
|
|
index: number,
|
|
|
|
ioFields: ImageOcclusionFieldIndexes,
|
|
|
|
) {
|
2023-07-27 14:45:49 +02:00
|
|
|
if (isImageOcclusion) {
|
2023-09-17 07:21:20 +02:00
|
|
|
if (index === ioFields.occlusions || index === ioFields.image) {
|
2023-07-27 14:45:49 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2023-10-22 02:40:40 +02:00
|
|
|
// Signal image occlusion image loading to Python
|
|
|
|
function onImageLoaded(event: CustomEvent<ImageLoadedEvent>) {
|
|
|
|
const detail = event.detail;
|
|
|
|
bridgeCommand(
|
|
|
|
`ioImageLoaded:${JSON.stringify(detail.path || detail.noteId?.toString())}`,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2023-10-13 00:47:50 +02:00
|
|
|
// Signal editor UI state changes to add-ons
|
|
|
|
|
|
|
|
let editorState: EditorState = EditorState.Initial;
|
|
|
|
let lastEditorState: EditorState = editorState;
|
|
|
|
|
|
|
|
function getEditorState(
|
|
|
|
ioMaskEditorVisible: boolean,
|
|
|
|
isImageOcclusion: boolean,
|
|
|
|
isIOImageLoaded: boolean,
|
|
|
|
imageOcclusionMode: IOMode | undefined,
|
|
|
|
): EditorState {
|
|
|
|
if (isImageOcclusion && ioMaskEditorVisible && !isIOImageLoaded) {
|
|
|
|
return EditorState.ImageOcclusionPicker;
|
|
|
|
} else if (imageOcclusionMode && ioMaskEditorVisible) {
|
|
|
|
return EditorState.ImageOcclusionMasks;
|
|
|
|
} else if (!ioMaskEditorVisible && isImageOcclusion) {
|
|
|
|
return EditorState.ImageOcclusionFields;
|
|
|
|
}
|
|
|
|
return EditorState.Fields;
|
|
|
|
}
|
|
|
|
|
|
|
|
function signalEditorState(newState: EditorState) {
|
|
|
|
tick().then(() => {
|
|
|
|
globalThis.editorState = newState;
|
|
|
|
bridgeCommand(`editorState:${newState}:${lastEditorState}`);
|
|
|
|
lastEditorState = newState;
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
$: signalEditorState(editorState);
|
|
|
|
|
|
|
|
$: editorState = getEditorState(
|
|
|
|
$ioMaskEditorVisible,
|
|
|
|
isImageOcclusion,
|
|
|
|
isIOImageLoaded,
|
|
|
|
imageOcclusionMode,
|
|
|
|
);
|
|
|
|
|
2022-02-03 05:52:11 +01:00
|
|
|
onMount(() => {
|
|
|
|
function wrap(before: string, after: string): void {
|
|
|
|
if (!$focusedInput || !editingInputIsRichText($focusedInput)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
$focusedInput.element.then((element) => {
|
|
|
|
wrapInternal(element, before, after, false);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
Object.assign(globalThis, {
|
2022-12-07 06:37:46 +01:00
|
|
|
saveSession,
|
2022-02-03 05:52:11 +01:00
|
|
|
setFields,
|
2022-08-31 15:34:39 +02:00
|
|
|
setCollapsed,
|
2022-08-18 04:30:18 +02:00
|
|
|
setPlainTexts,
|
2022-02-03 05:52:11 +01:00
|
|
|
setDescriptions,
|
|
|
|
setFonts,
|
|
|
|
focusField,
|
|
|
|
setTags,
|
2022-09-28 06:02:32 +02:00
|
|
|
setTagsCollapsed,
|
2022-02-03 05:52:11 +01:00
|
|
|
setBackgrounds,
|
|
|
|
setClozeHint,
|
2023-03-16 07:48:29 +01:00
|
|
|
saveNow,
|
2022-02-03 05:52:11 +01:00
|
|
|
focusIfField,
|
2022-05-23 01:14:36 +02:00
|
|
|
getNoteId,
|
2022-02-03 05:52:11 +01:00
|
|
|
setNoteId,
|
2023-06-14 01:38:06 +02:00
|
|
|
setNotetypeMeta,
|
2022-02-03 05:52:11 +01:00
|
|
|
wrap,
|
2022-08-18 04:06:06 +02:00
|
|
|
setMathjaxEnabled,
|
2022-09-26 01:47:50 +02:00
|
|
|
setShrinkImages,
|
2022-10-03 05:14:57 +02:00
|
|
|
setCloseHTMLTags,
|
2023-03-08 10:22:02 +01:00
|
|
|
triggerChanges,
|
2023-07-27 14:45:49 +02:00
|
|
|
setIsImageOcclusion,
|
|
|
|
setupMaskEditor,
|
2023-10-23 01:12:56 +02:00
|
|
|
updateOcclusionsField,
|
2022-02-03 05:52:11 +01:00
|
|
|
...oldEditorAdapter,
|
|
|
|
});
|
|
|
|
|
2023-10-13 00:47:50 +02:00
|
|
|
editorState = getEditorState(
|
|
|
|
$ioMaskEditorVisible,
|
|
|
|
isImageOcclusion,
|
|
|
|
isIOImageLoaded,
|
|
|
|
imageOcclusionMode,
|
|
|
|
);
|
|
|
|
|
2022-02-03 05:52:11 +01:00
|
|
|
document.addEventListener("visibilitychange", saveOnPageHide);
|
|
|
|
return () => document.removeEventListener("visibilitychange", saveOnPageHide);
|
|
|
|
});
|
|
|
|
|
|
|
|
let apiPartial: Partial<NoteEditorAPI> = {};
|
|
|
|
export { apiPartial as api };
|
|
|
|
|
Field redesign (#2002)
* Adjust size of legacy buttons
* Revert "Adjust size of legacy buttons"
This reverts commit fb888fe1db9050c34b1a7b0820e6da5ac91ccee6.
* Remove unused function from #1476
* Use outline version for tag icon
* Add chevron icons
* Remove code icons, keep one pin icon version
* Add code-bg color
* Redesign fields
* Remove unused import
* Fix imports
* Move PlainTextBadge between editing inputs
where it belongs :)
* Make whole separator line clickable
* Fix transition
and format
* Don't show toggle when field is collapsed
* Show toggle only on hover
for mobile I'd like to implement a swipe mechanism.
* Use tweened SVG for triangle instead of CSS hack
* Implement more obvious HTML toggle on bottom right
* Reduce field height by a few pixels
* Reduce field height by two pixels
* Show HTML toggle when PlainTextInput is active, regardless of hover/focus
* Remove RichTextBadge.svelte
* Create separate collapsed field state
this means users can collapse fields with the HTML editor open and it will stay open when the field is expanded again.
* Add slide out animation to EditingArea, RichTextInput and PlainTextInput
only for collapsing, because it is choppy on expansion (common issue with Svelte transitions).
* Fix aliasing issue on focused field corners
* Make StickyBadge feel more responsive
* Move StickyBadge closer to field border
* Adjust field gutter/margins
* Make LabelContainer sticky
to make field operations accessible on fields with a lot of content.
* Add back html icons, remove visual editor icons
* Revert "Add code-bg color"
This reverts commit 4200f354193710b3acd9bcf84b67958e200ddcdb.
* Add rich text icon, remove strikethrough code icon
* Revert PlainTextBadge to original position
* Adjust margins in FieldState
* Rename PlainTextBadge to SecondaryInputBadge
in preparation for #1987
* Run eslint and prettier
* Make whole LabelContainer clickable area for collapse/expand
* Revert "Add slide out animation to EditingArea, RichTextInput and PlainTextInput"
This reverts commit 9a2b3410d0ead37ae1da408d68e14507a058a613.
* Fix error on collapse/expansion
this was caused by the {#if} blocks, which resulted in the deletion of original EditingAreas.
* Refocus when toggling chevron and secondary input badge
* Revert "Revert "Add code-bg color""
This reverts commit 1cfd3bda65354ab90c1ab4cbbef47596a1be8754.
* Use single rotating chevron icon and make it RTL-compatible
* Remove redundant CSS transition rule
* Introduce animated Collapsible component and fix refocus on toggle
* Do not try to force repaint, as it is not required
* Remove RTL store from LabelContainer
the direction is already applied globally.
* Collapse secondary input with field
* Add focusedField to NoteEditorAPI
* Replace :global CSS selector with class .visible
thus removing the assumption that the component is used inside an EditorField.
https://github.com/ankitects/anki/pull/2002#discussion_r944876448
* Use named function syntax instead of function expressions
* Add explanation comment
* Remove unnecessary :bind directive
* Create CollapseBadge component
* Move :global selector into .plain-text-input
* Add comment explaining box-shadow pseudo-element
* Move Collapsible from EditingArea, PlainTextInput and RichTextInput into user components
* Rename SecondaryInputBadge to PlainTextBadge and remove generalization logic
I kept the rich text icon inside icons.ts for future use.
* Sort imports
* Fix background-color for duplicates not showing
with yet another pseudo-element :)
The pseudo-element that covers up field borders on scroll caused this issue. Fighting fire with fire here.
* Increase size of plain text toggle to original value again
This makes the clickable area a bit bigger and looks slightly more consistent with StickyBadge.
* Scrap pseudo-element mess in LabelContainer and tackle the actual issue
* Add class .visible to StickyBadge too
This introduces a peculiar bug: The active prop of StickyBadge resets to false when the mouse leaves the field - regardless of the actual back-end value.
* Fix sticky badge resetting on mouseleave/blur
* Apply overflow: hidden only during transition
fixes MathJax handle getting cut off by fields
* Remove unused variable
* Fix visual bug caused by overflow:hidden not applying in time
I tried several asynchronous approaches, but they all caused issues: either they prevented the CSS transition or they made field inputs lose focus.
In the end I resorted to direct, synchronous DOM-manipulation and added an explanatory comment.
* Decrease Collapsible load time by blocking first transition
I noticed the sliding animation has a hefty performance impact when a large number of fields is loaded simultaneously.
Blocking the first transition (which isn't even visible) results in a big boost in load time.
* Replace usages of gap with margins for children
* Revert unnecessary removal of grid-gap definition
* Correct comments about flex-gap property
mistook that for grid-gap.
* Resolve style issues
* Add minimum targets to gap comment
Co-authored-by: Henrik Giesel <hengiesel@gmail.com>
2022-08-19 02:02:28 +02:00
|
|
|
const hoveredField: NoteEditorAPI["hoveredField"] = writable(null);
|
2022-02-03 05:52:11 +01:00
|
|
|
const focusedField: NoteEditorAPI["focusedField"] = writable(null);
|
|
|
|
const focusedInput: NoteEditorAPI["focusedInput"] = writable(null);
|
|
|
|
|
|
|
|
const api: NoteEditorAPI = {
|
|
|
|
...apiPartial,
|
Field redesign (#2002)
* Adjust size of legacy buttons
* Revert "Adjust size of legacy buttons"
This reverts commit fb888fe1db9050c34b1a7b0820e6da5ac91ccee6.
* Remove unused function from #1476
* Use outline version for tag icon
* Add chevron icons
* Remove code icons, keep one pin icon version
* Add code-bg color
* Redesign fields
* Remove unused import
* Fix imports
* Move PlainTextBadge between editing inputs
where it belongs :)
* Make whole separator line clickable
* Fix transition
and format
* Don't show toggle when field is collapsed
* Show toggle only on hover
for mobile I'd like to implement a swipe mechanism.
* Use tweened SVG for triangle instead of CSS hack
* Implement more obvious HTML toggle on bottom right
* Reduce field height by a few pixels
* Reduce field height by two pixels
* Show HTML toggle when PlainTextInput is active, regardless of hover/focus
* Remove RichTextBadge.svelte
* Create separate collapsed field state
this means users can collapse fields with the HTML editor open and it will stay open when the field is expanded again.
* Add slide out animation to EditingArea, RichTextInput and PlainTextInput
only for collapsing, because it is choppy on expansion (common issue with Svelte transitions).
* Fix aliasing issue on focused field corners
* Make StickyBadge feel more responsive
* Move StickyBadge closer to field border
* Adjust field gutter/margins
* Make LabelContainer sticky
to make field operations accessible on fields with a lot of content.
* Add back html icons, remove visual editor icons
* Revert "Add code-bg color"
This reverts commit 4200f354193710b3acd9bcf84b67958e200ddcdb.
* Add rich text icon, remove strikethrough code icon
* Revert PlainTextBadge to original position
* Adjust margins in FieldState
* Rename PlainTextBadge to SecondaryInputBadge
in preparation for #1987
* Run eslint and prettier
* Make whole LabelContainer clickable area for collapse/expand
* Revert "Add slide out animation to EditingArea, RichTextInput and PlainTextInput"
This reverts commit 9a2b3410d0ead37ae1da408d68e14507a058a613.
* Fix error on collapse/expansion
this was caused by the {#if} blocks, which resulted in the deletion of original EditingAreas.
* Refocus when toggling chevron and secondary input badge
* Revert "Revert "Add code-bg color""
This reverts commit 1cfd3bda65354ab90c1ab4cbbef47596a1be8754.
* Use single rotating chevron icon and make it RTL-compatible
* Remove redundant CSS transition rule
* Introduce animated Collapsible component and fix refocus on toggle
* Do not try to force repaint, as it is not required
* Remove RTL store from LabelContainer
the direction is already applied globally.
* Collapse secondary input with field
* Add focusedField to NoteEditorAPI
* Replace :global CSS selector with class .visible
thus removing the assumption that the component is used inside an EditorField.
https://github.com/ankitects/anki/pull/2002#discussion_r944876448
* Use named function syntax instead of function expressions
* Add explanation comment
* Remove unnecessary :bind directive
* Create CollapseBadge component
* Move :global selector into .plain-text-input
* Add comment explaining box-shadow pseudo-element
* Move Collapsible from EditingArea, PlainTextInput and RichTextInput into user components
* Rename SecondaryInputBadge to PlainTextBadge and remove generalization logic
I kept the rich text icon inside icons.ts for future use.
* Sort imports
* Fix background-color for duplicates not showing
with yet another pseudo-element :)
The pseudo-element that covers up field borders on scroll caused this issue. Fighting fire with fire here.
* Increase size of plain text toggle to original value again
This makes the clickable area a bit bigger and looks slightly more consistent with StickyBadge.
* Scrap pseudo-element mess in LabelContainer and tackle the actual issue
* Add class .visible to StickyBadge too
This introduces a peculiar bug: The active prop of StickyBadge resets to false when the mouse leaves the field - regardless of the actual back-end value.
* Fix sticky badge resetting on mouseleave/blur
* Apply overflow: hidden only during transition
fixes MathJax handle getting cut off by fields
* Remove unused variable
* Fix visual bug caused by overflow:hidden not applying in time
I tried several asynchronous approaches, but they all caused issues: either they prevented the CSS transition or they made field inputs lose focus.
In the end I resorted to direct, synchronous DOM-manipulation and added an explanatory comment.
* Decrease Collapsible load time by blocking first transition
I noticed the sliding animation has a hefty performance impact when a large number of fields is loaded simultaneously.
Blocking the first transition (which isn't even visible) results in a big boost in load time.
* Replace usages of gap with margins for children
* Revert unnecessary removal of grid-gap definition
* Correct comments about flex-gap property
mistook that for grid-gap.
* Resolve style issues
* Add minimum targets to gap comment
Co-authored-by: Henrik Giesel <hengiesel@gmail.com>
2022-08-19 02:02:28 +02:00
|
|
|
hoveredField,
|
2022-02-03 05:52:11 +01:00
|
|
|
focusedField,
|
|
|
|
focusedInput,
|
|
|
|
toolbar: toolbar as EditorToolbarAPI,
|
|
|
|
fields,
|
|
|
|
};
|
|
|
|
|
|
|
|
setContextProperty(api);
|
|
|
|
setupLifecycleHooks(api);
|
2022-09-28 06:02:32 +02:00
|
|
|
|
|
|
|
$: tagAmount = $tags.length;
|
2022-02-03 05:52:11 +01:00
|
|
|
</script>
|
|
|
|
|
2022-04-19 09:20:26 +02:00
|
|
|
<!--
|
|
|
|
@component
|
|
|
|
Serves as a pre-slotted convenience component which combines all the common
|
|
|
|
components and functionality for general note editing.
|
|
|
|
|
2022-11-24 11:18:57 +01:00
|
|
|
Functionality exclusive to specific note-editing views (e.g. in the browser or
|
2022-04-19 09:20:26 +02:00
|
|
|
the AddCards dialog) should be implemented in the user of this component.
|
|
|
|
-->
|
2023-02-27 07:23:19 +01:00
|
|
|
<div class="note-editor">
|
2022-09-12 11:22:22 +02:00
|
|
|
<EditorToolbar {size} {wrap} api={toolbar}>
|
|
|
|
<slot slot="notetypeButtons" name="notetypeButtons" />
|
|
|
|
</EditorToolbar>
|
|
|
|
|
|
|
|
{#if hint}
|
|
|
|
<Absolute bottom right --margin="10px">
|
|
|
|
<Notification>
|
2023-06-01 03:11:26 +02:00
|
|
|
<Badge --badge-color="tomato" --icon-align="top">
|
|
|
|
{@html alertIcon}
|
|
|
|
</Badge>
|
2022-09-12 11:22:22 +02:00
|
|
|
<span>{@html hint}</span>
|
|
|
|
</Notification>
|
|
|
|
</Absolute>
|
|
|
|
{/if}
|
|
|
|
|
2023-07-27 14:45:49 +02:00
|
|
|
{#if imageOcclusionMode}
|
|
|
|
<div style="display: {$ioMaskEditorVisible ? 'block' : 'none'}">
|
2023-07-31 06:24:26 +02:00
|
|
|
<ImageOcclusionPage
|
|
|
|
mode={imageOcclusionMode}
|
2023-10-23 01:12:56 +02:00
|
|
|
on:change={updateOcclusionsField}
|
2023-10-22 02:40:40 +02:00
|
|
|
on:image-loaded={onImageLoaded}
|
2023-07-31 06:24:26 +02:00
|
|
|
/>
|
2023-07-27 14:45:49 +02:00
|
|
|
</div>
|
|
|
|
{/if}
|
|
|
|
|
|
|
|
{#if $ioMaskEditorVisible && isImageOcclusion && !isIOImageLoaded}
|
2023-10-10 05:26:20 +02:00
|
|
|
<ImageOcclusionPicker
|
|
|
|
onPickImage={pickIOImage}
|
|
|
|
onPickImageFromClipboard={pickIOImageFromClipboard}
|
|
|
|
/>
|
2023-07-27 14:45:49 +02:00
|
|
|
{/if}
|
|
|
|
|
|
|
|
{#if !$ioMaskEditorVisible}
|
|
|
|
<Fields>
|
|
|
|
{#each fieldsData as field, index}
|
|
|
|
{@const content = fieldStores[index]}
|
|
|
|
|
|
|
|
<EditorField
|
|
|
|
{field}
|
|
|
|
{content}
|
|
|
|
flipInputs={plainTextDefaults[index]}
|
|
|
|
api={fields[index]}
|
|
|
|
on:focusin={() => {
|
|
|
|
$focusedField = fields[index];
|
|
|
|
setAddonButtonsDisabled(false);
|
|
|
|
bridgeCommand(`focus:${index}`);
|
|
|
|
}}
|
|
|
|
on:focusout={() => {
|
|
|
|
$focusedField = null;
|
|
|
|
setAddonButtonsDisabled(true);
|
|
|
|
bridgeCommand(
|
|
|
|
`blur:${index}:${getNoteId()}:${transformContentBeforeSave(
|
|
|
|
get(content),
|
|
|
|
)}`,
|
|
|
|
);
|
|
|
|
}}
|
|
|
|
on:mouseenter={() => {
|
|
|
|
$hoveredField = fields[index];
|
|
|
|
}}
|
|
|
|
on:mouseleave={() => {
|
|
|
|
$hoveredField = null;
|
|
|
|
}}
|
|
|
|
collapsed={fieldsCollapsed[index]}
|
|
|
|
dupe={cols[index] === "dupe"}
|
|
|
|
--description-font-size="{field.fontSize}px"
|
|
|
|
--description-content={`"${field.description}"`}
|
|
|
|
>
|
|
|
|
<svelte:fragment slot="field-label">
|
|
|
|
<LabelContainer
|
|
|
|
collapsed={fieldsCollapsed[index]}
|
|
|
|
on:toggle={() => toggleField(index)}
|
|
|
|
--icon-align="bottom"
|
|
|
|
>
|
|
|
|
<svelte:fragment slot="field-name">
|
|
|
|
<LabelName>
|
|
|
|
{field.name}
|
|
|
|
</LabelName>
|
|
|
|
</svelte:fragment>
|
|
|
|
<FieldState>
|
|
|
|
{#if cols[index] === "dupe"}
|
|
|
|
<DuplicateLink />
|
|
|
|
{/if}
|
|
|
|
{#if plainTextDefaults[index]}
|
|
|
|
<RichTextBadge
|
|
|
|
show={!fieldsCollapsed[index] &&
|
|
|
|
(fields[index] === $hoveredField ||
|
|
|
|
fields[index] === $focusedField)}
|
|
|
|
bind:off={richTextsHidden[index]}
|
|
|
|
on:toggle={() => toggleRichTextInput(index)}
|
|
|
|
/>
|
|
|
|
{:else}
|
|
|
|
<PlainTextBadge
|
|
|
|
show={!fieldsCollapsed[index] &&
|
|
|
|
(fields[index] === $hoveredField ||
|
|
|
|
fields[index] === $focusedField)}
|
|
|
|
bind:off={plainTextsHidden[index]}
|
|
|
|
on:toggle={() => togglePlainTextInput(index)}
|
|
|
|
/>
|
|
|
|
{/if}
|
|
|
|
<slot
|
|
|
|
name="field-state"
|
|
|
|
{field}
|
|
|
|
{index}
|
|
|
|
show={fields[index] === $hoveredField ||
|
|
|
|
fields[index] === $focusedField}
|
2022-10-27 01:11:36 +02:00
|
|
|
/>
|
2023-07-27 14:45:49 +02:00
|
|
|
</FieldState>
|
|
|
|
</LabelContainer>
|
|
|
|
</svelte:fragment>
|
|
|
|
<svelte:fragment slot="rich-text-input">
|
|
|
|
<Collapsible
|
|
|
|
collapse={richTextsHidden[index]}
|
|
|
|
let:collapsed={hidden}
|
|
|
|
toggleDisplay
|
|
|
|
>
|
|
|
|
<RichTextInput
|
|
|
|
{hidden}
|
|
|
|
on:focusout={() => {
|
|
|
|
saveFieldNow();
|
|
|
|
$focusedInput = null;
|
|
|
|
}}
|
|
|
|
bind:this={richTextInputs[index]}
|
|
|
|
/>
|
|
|
|
</Collapsible>
|
|
|
|
</svelte:fragment>
|
|
|
|
<svelte:fragment slot="plain-text-input">
|
|
|
|
<Collapsible
|
|
|
|
collapse={plainTextsHidden[index]}
|
|
|
|
let:collapsed={hidden}
|
|
|
|
toggleDisplay
|
|
|
|
>
|
|
|
|
<PlainTextInput
|
|
|
|
{hidden}
|
2023-10-31 22:48:13 +01:00
|
|
|
fieldCollapsed={fieldsCollapsed[index]}
|
2023-07-27 14:45:49 +02:00
|
|
|
on:focusout={() => {
|
|
|
|
saveFieldNow();
|
|
|
|
$focusedInput = null;
|
|
|
|
}}
|
|
|
|
bind:this={plainTextInputs[index]}
|
2023-02-27 07:23:19 +01:00
|
|
|
/>
|
2023-07-27 14:45:49 +02:00
|
|
|
</Collapsible>
|
|
|
|
</svelte:fragment>
|
|
|
|
</EditorField>
|
|
|
|
{/each}
|
|
|
|
|
|
|
|
<MathjaxOverlay />
|
|
|
|
<ImageOverlay maxWidth={250} maxHeight={125} />
|
|
|
|
</Fields>
|
|
|
|
|
|
|
|
<Shortcut
|
|
|
|
keyCombination="Control+Shift+T"
|
|
|
|
on:action={() => {
|
|
|
|
updateTagsCollapsed(false);
|
|
|
|
}}
|
|
|
|
/>
|
|
|
|
<CollapseLabel
|
|
|
|
collapsed={$tagsCollapsed}
|
|
|
|
tooltip={$tagsCollapsed ? tr.editingExpand() : tr.editingCollapse()}
|
|
|
|
on:toggle={() => updateTagsCollapsed(!$tagsCollapsed)}
|
|
|
|
>
|
|
|
|
{@html `${tagAmount > 0 ? tagAmount : ""} ${tr.editingTags()}`}
|
|
|
|
</CollapseLabel>
|
|
|
|
<Collapsible toggleDisplay collapse={$tagsCollapsed}>
|
|
|
|
<TagEditor {tags} on:tagsupdate={saveTags} />
|
|
|
|
</Collapsible>
|
|
|
|
{/if}
|
2021-10-18 14:01:15 +02:00
|
|
|
</div>
|
|
|
|
|
|
|
|
<style lang="scss">
|
|
|
|
.note-editor {
|
|
|
|
display: flex;
|
|
|
|
flex-direction: column;
|
2022-09-12 11:22:22 +02:00
|
|
|
height: 100%;
|
|
|
|
}
|
2023-07-27 14:45:49 +02:00
|
|
|
|
|
|
|
:global(.image-occlusion) {
|
|
|
|
position: fixed;
|
|
|
|
}
|
|
|
|
|
|
|
|
:global(.image-occlusion .tab-buttons) {
|
|
|
|
display: none !important;
|
|
|
|
}
|
|
|
|
|
|
|
|
:global(.image-occlusion .top-tool-bar-container) {
|
|
|
|
margin-left: 28px !important;
|
|
|
|
}
|
|
|
|
:global(.top-tool-bar-container .icon-button) {
|
|
|
|
height: 36px !important;
|
2023-11-24 05:06:40 +01:00
|
|
|
line-height: 1;
|
2023-07-27 14:45:49 +02:00
|
|
|
}
|
|
|
|
:global(.image-occlusion .tool-bar-container) {
|
|
|
|
top: unset !important;
|
|
|
|
margin-top: 2px !important;
|
|
|
|
}
|
|
|
|
:global(.image-occlusion .sticky-footer) {
|
|
|
|
display: none;
|
|
|
|
}
|
2021-10-18 14:01:15 +02:00
|
|
|
</style>
|