8142176f84
* Remove --medium-border variable * Implement color palette using Sass maps I hand-picked the gray tones, the other colors are from the Tailwind CSS v3 palette. Significant changes: - light theme is brighter - dark theme is darker - borders are softer I also deleted some platform- and night-mode-specific code. * Use custom colors for note view switch * Use same placeholder color for all inputs * Skew color palette for more dark values by removing gray[3], which wasn't used anywhere. Slight adjustments were made to the darker tones. * Adjust frame- window- and border colors * Give deck browser entries --frame-bg as background color * Define styling for QComboBox and QLineEdit globally * Experiment with CSS filter for inline-colors Inside darker inputs, some colors like dark blue will be hard to read, so we could try to improve text-color contrast with global adjustments depending on the theme. * Use different map structure for _vars.scss after @hgiesel's idea: https://github.com/ankitects/anki/pull/2016#discussion_r947087871 * Move custom QLineEdit styles out of searchbar.py * Merge branch 'main' into color-palette * Revert QComboBox stylesheet override * Align gray color palette more with macOS * Adjust light theme * Use --slightly-grey-text for options tab color * Replace gray tones with more neutral values * Improve categorization of global colors by renaming almost all of them and sorting them into separate maps. * Saturate highlight-bg in light theme * Tweak gray tones * Adjust box-shadow of EditingArea to make fields look inset * Add Sass functions to access color palette and semantic variables in response to https://github.com/ankitects/anki/pull/2016#issuecomment-1220571076 * Showcase use of access functions in several locations @hgiesel in buttons.scss I access the color palette directly. Is this what you meant by "... keep it local to the component, and possibly make it global at a later time ..."? * Fix focus box shadow transition and remove default shadow for a cleaner look I couldn't quite get the inset look the way I wanted, because inset box-shadows do not respect the border radius, therefore causing aliasing. * Tweak light theme border and shadow colors * Add functions and colors to base_lib * Add vars_lib as dependency to base_lib and button_mixins_lib * Improve uses of default-themed variables * Use old --frame-bg color and use darker tone for canvas-default * Return CSS var by default and add palette-of function for raw value * Showcase use of palette-of function The #{...} syntax is required only because the use cases are CSS var definitions. In other cases a simple palette-of(keyword, theme) would suffice. * Light theme: decrease brightness of canvas-default and adjust fg-default * Use canvas-inset variable for switch knob * Adjust light theme * Add back box-shadow to EditingArea * Light theme: darken background and flatten transition also set hue and saturation of gray-8 to 0 (like all the other grays). * Reduce flag colors to single default value * Tweak card/note accent colors * Experiment with inset look for fields again Is this too dark in night mode? It's the same color used for all other text inputs. * Dark theme: make border-default one shade darker * Tweak inset shadow color * Dark theme: make border-faint darker than canvas-default meaning two shades darker than it currently was. * Fix PlainTextInput not expanding * Dark theme: use less saturated flag colors * Adjust gray tones * Fix nested variables not getting extracted correctly * Rename canvas-outset to canvas-elevated * Light theme: darken canvas-default * Make canvas-elevated a bit darker * Rename variables and use them in various components * Refactor button mixins * Remove fusion vars from Anki * Adjust button gradients * Refactor button mixins * Fix deck browser table td background color * Use color function in buttons.scss * Rework QTabWidget stylesheet * Fix crash on browser open * Perfect QTableView header * Fix bottom toolbar button gradient * Fix focus outline of bottom toolbar buttons * Fix custom webview scrollbar * Fix uses of vars in various webviews The command @use vars as * lead to repeated inclusion of the CSS vars. * Enable primary button color with mixin * Run prettier * Fix Python code style issues * Tweak colors * Lighten scrollbar shades in light theme * Fix code style issues caused by merge * Fix harsh border color in editor caused by leftover --medium-border variables, probably introduced with a merge commit. * Compile Sass before extracting Python colors/props This means the Python side doesn't need to worry about the map structure and Sass functions, just copy the output CSS values. * Desaturate primary button colors by 10% * Convert accidentally capitalized variable names to lowercase * Simplify color definitions with qcolor function * Remove default border-focus variable * Remove redundant colon * Apply custom scrollbar CSS only on Windows and Linux * Make border-subtle color brighter than background in dark theme * Make border-subtle color a shade brighter in light theme * Use border-subtle for NoteEditor and EditorToolbar border * Small patches
133 lines
3.9 KiB
Svelte
133 lines
3.9 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 type CodeMirrorLib from "codemirror";
|
|
import { createEventDispatcher, onMount } from "svelte";
|
|
import type { Writable } from "svelte/store";
|
|
|
|
import * as tr from "../../lib/ftl";
|
|
import { noop } from "../../lib/functional";
|
|
import { isArrowLeft, isArrowRight } from "../../lib/keys";
|
|
import { getPlatformString } from "../../lib/shortcuts";
|
|
import { pageTheme } from "../../sveltelib/theme";
|
|
import { baseOptions, focusAndSetCaret, latex } from "../code-mirror";
|
|
import type { CodeMirrorAPI } from "../CodeMirror.svelte";
|
|
import CodeMirror from "../CodeMirror.svelte";
|
|
|
|
export let code: Writable<string>;
|
|
export let acceptShortcut: string;
|
|
export let newlineShortcut: string;
|
|
|
|
const configuration = {
|
|
...Object.assign({}, baseOptions, {
|
|
extraKeys: {
|
|
...(baseOptions.extraKeys as CodeMirrorLib.KeyMap),
|
|
[acceptShortcut]: noop,
|
|
[newlineShortcut]: noop,
|
|
},
|
|
}),
|
|
placeholder: tr.editingMathjaxPlaceholder({
|
|
accept: getPlatformString(acceptShortcut),
|
|
newline: getPlatformString(newlineShortcut),
|
|
}),
|
|
mode: latex,
|
|
};
|
|
|
|
/* These are not reactive, but only operate on initialization */
|
|
export let position: CodeMirrorLib.Position | undefined = undefined;
|
|
export let selectAll: boolean;
|
|
|
|
const dispatch = createEventDispatcher();
|
|
|
|
let codeMirror = {} as CodeMirrorAPI;
|
|
|
|
onMount(async () => {
|
|
const editor = await codeMirror.editor;
|
|
|
|
let direction: "start" | "end" | undefined = undefined;
|
|
|
|
editor.on(
|
|
"keydown",
|
|
(_instance: CodeMirrorLib.Editor, event: KeyboardEvent): void => {
|
|
if (isArrowLeft(event)) {
|
|
direction = "start";
|
|
} else if (isArrowRight(event)) {
|
|
direction = "end";
|
|
}
|
|
},
|
|
);
|
|
|
|
editor.on(
|
|
"beforeSelectionChange",
|
|
(
|
|
instance: CodeMirrorLib.Editor,
|
|
obj: CodeMirrorLib.EditorSelectionChange,
|
|
): void => {
|
|
const { anchor } = obj.ranges[0];
|
|
|
|
if (anchor["hitSide"]) {
|
|
if (instance.getValue().length === 0) {
|
|
if (direction) {
|
|
dispatch(`moveout${direction}`);
|
|
}
|
|
} else if (anchor.line === 0 && anchor.ch === 0) {
|
|
dispatch("moveoutstart");
|
|
} else {
|
|
dispatch("moveoutend");
|
|
}
|
|
}
|
|
|
|
direction = undefined;
|
|
},
|
|
);
|
|
|
|
setTimeout(() => {
|
|
focusAndSetCaret(editor, position);
|
|
|
|
if (selectAll) {
|
|
editor.execCommand("selectAll");
|
|
}
|
|
});
|
|
});
|
|
</script>
|
|
|
|
<div class="mathjax-editor" class:light-theme={!$pageTheme.isDark}>
|
|
<CodeMirror
|
|
{code}
|
|
{configuration}
|
|
bind:api={codeMirror}
|
|
on:change={({ detail: mathjaxText }) => code.set(mathjaxText)}
|
|
on:tab
|
|
/>
|
|
</div>
|
|
|
|
<slot editor={codeMirror} />
|
|
|
|
<style lang="scss">
|
|
.mathjax-editor {
|
|
margin: 0 1px;
|
|
overflow: hidden;
|
|
|
|
:global(.CodeMirror) {
|
|
max-width: 28rem;
|
|
min-width: 14rem;
|
|
margin-bottom: 0.25rem;
|
|
}
|
|
|
|
&.light-theme :global(.CodeMirror) {
|
|
border-width: 1px 0;
|
|
border-style: solid;
|
|
border-color: var(--border);
|
|
}
|
|
|
|
:global(.CodeMirror-placeholder) {
|
|
font-family: sans-serif;
|
|
font-size: 55%;
|
|
text-align: center;
|
|
color: var(--fg-subtle);
|
|
}
|
|
}
|
|
</style>
|