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
216 lines
5.9 KiB
Svelte
216 lines
5.9 KiB
Svelte
<!--
|
|
Copyright: Ankitects Pty Ltd and contributors
|
|
License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
-->
|
|
<script context="module" lang="ts">
|
|
import type { Writable } from "svelte/store";
|
|
|
|
import contextProperty from "../sveltelib/context-property";
|
|
|
|
export interface FocusableInputAPI {
|
|
readonly name: string;
|
|
focusable: boolean;
|
|
/**
|
|
* The reaction to a user-initiated focus, e.g. by clicking on the
|
|
* editor label, or pressing Tab.
|
|
*/
|
|
focus(): void;
|
|
/**
|
|
* Behaves similar to a refresh, e.g. sync with content, put the caret
|
|
* into a neutral position, and/or clear selections.
|
|
*/
|
|
refocus(): void;
|
|
}
|
|
|
|
export interface EditingInputAPI extends FocusableInputAPI {
|
|
/**
|
|
* Check whether blurred target belongs to an editing input.
|
|
* The editing area can then restore focus to this input.
|
|
*
|
|
* @returns An editing input api that is associated with the event target.
|
|
*/
|
|
getInputAPI(target: EventTarget): Promise<FocusableInputAPI | null>;
|
|
}
|
|
|
|
export interface EditingAreaAPI {
|
|
content: Writable<string>;
|
|
editingInputs: Writable<EditingInputAPI[]>;
|
|
focus(): void;
|
|
refocus(): void;
|
|
}
|
|
|
|
const key = Symbol("editingArea");
|
|
const [context, setContextProperty] = contextProperty<EditingAreaAPI>(key);
|
|
|
|
export { context };
|
|
</script>
|
|
|
|
<script lang="ts">
|
|
import { setContext as svelteSetContext, tick } from "svelte";
|
|
import { writable } from "svelte/store";
|
|
|
|
import { fontFamilyKey, fontSizeKey } from "../lib/context-keys";
|
|
import FocusTrap from "./FocusTrap.svelte";
|
|
|
|
export let fontFamily: string;
|
|
const fontFamilyStore = writable(fontFamily);
|
|
$: $fontFamilyStore = fontFamily;
|
|
svelteSetContext(fontFamilyKey, fontFamilyStore);
|
|
|
|
export let fontSize: number;
|
|
const fontSizeStore = writable(fontSize);
|
|
$: $fontSizeStore = fontSize;
|
|
svelteSetContext(fontSizeKey, fontSizeStore);
|
|
|
|
export let content: Writable<string>;
|
|
|
|
let editingArea: HTMLElement;
|
|
let focusTrap: FocusTrap;
|
|
|
|
const inputsStore = writable<EditingInputAPI[]>([]);
|
|
$: editingInputs = $inputsStore;
|
|
|
|
function getAvailableInput(): EditingInputAPI | undefined {
|
|
return editingInputs.find((input) => input.focusable);
|
|
}
|
|
|
|
function focusEditingInputIfAvailable(): boolean {
|
|
const availableInput = getAvailableInput();
|
|
|
|
if (availableInput) {
|
|
availableInput.focus();
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
function focusEditingInputIfFocusTrapFocused(): void {
|
|
if (focusTrap && focusTrap.isFocusTrap(document.activeElement!)) {
|
|
focusEditingInputIfAvailable();
|
|
}
|
|
}
|
|
|
|
$: {
|
|
$inputsStore;
|
|
/**
|
|
* Triggers when all editing inputs are hidden,
|
|
* the editor field has focus, and then some
|
|
* editing input is shown
|
|
*/
|
|
focusEditingInputIfFocusTrapFocused();
|
|
}
|
|
|
|
function focus(): void {
|
|
if (editingArea.contains(document.activeElement)) {
|
|
// do nothing
|
|
} else if (!focusEditingInputIfAvailable()) {
|
|
focusTrap.focus();
|
|
}
|
|
}
|
|
|
|
function refocus(): void {
|
|
const availableInput = getAvailableInput();
|
|
|
|
if (availableInput) {
|
|
availableInput.refocus();
|
|
} else {
|
|
focusTrap.blur();
|
|
focusTrap.focus();
|
|
}
|
|
}
|
|
|
|
function focusEditingInputInsteadIfAvailable(event: FocusEvent): void {
|
|
if (focusEditingInputIfAvailable()) {
|
|
event.preventDefault();
|
|
}
|
|
}
|
|
|
|
// Prevents editor field being entirely deselected when
|
|
// closing active field.
|
|
async function trapFocusOnBlurOut(event: FocusEvent): Promise<void> {
|
|
if (event.relatedTarget) {
|
|
return;
|
|
}
|
|
|
|
event.preventDefault();
|
|
|
|
const oldInputElement = event.target;
|
|
|
|
await tick();
|
|
|
|
let focusableInput: FocusableInputAPI | null = null;
|
|
|
|
const focusableInputs = editingInputs.filter(
|
|
(input: EditingInputAPI): boolean => input.focusable,
|
|
);
|
|
|
|
if (oldInputElement) {
|
|
for (const input of focusableInputs) {
|
|
focusableInput = await input.getInputAPI(oldInputElement);
|
|
|
|
if (focusableInput) {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (focusableInput || (focusableInput = focusableInputs[0])) {
|
|
focusableInput.focus();
|
|
} else {
|
|
focusTrap.focus();
|
|
}
|
|
}
|
|
|
|
let apiPartial: Partial<EditingAreaAPI>;
|
|
export { apiPartial as api };
|
|
|
|
const api = Object.assign(apiPartial, {
|
|
content,
|
|
editingInputs: inputsStore,
|
|
focus,
|
|
refocus,
|
|
});
|
|
|
|
setContextProperty(api);
|
|
</script>
|
|
|
|
<FocusTrap bind:this={focusTrap} on:focus={focusEditingInputInsteadIfAvailable} />
|
|
|
|
<div bind:this={editingArea} class="editing-area" on:focusout={trapFocusOnBlurOut}>
|
|
<slot />
|
|
</div>
|
|
|
|
<style lang="scss">
|
|
.editing-area {
|
|
display: grid;
|
|
/* TODO allow configuration of grid #1503 */
|
|
/* grid-template-columns: repeat(2, 1fr); */
|
|
|
|
position: relative;
|
|
background: var(--canvas-elevated);
|
|
border-radius: 5px;
|
|
|
|
/* Pseudo-element required to display
|
|
inset focus box-shadow above field contents */
|
|
&::after {
|
|
content: "";
|
|
position: absolute;
|
|
inset: 0;
|
|
pointer-events: none;
|
|
border-radius: 5px;
|
|
box-shadow: 0 0 2px 1px var(--shadow);
|
|
transition: box-shadow 80ms cubic-bezier(0.33, 1, 0.68, 1);
|
|
}
|
|
|
|
&:focus-within {
|
|
outline: none;
|
|
&::after {
|
|
border: none;
|
|
inset: 1px;
|
|
box-shadow: 0 0 0 2px var(--border-focus);
|
|
}
|
|
}
|
|
}
|
|
</style>
|