mirror of
https://github.com/ankitects/anki.git
synced 2025-11-07 05:07:10 -05:00
* Update to latest Node LTS * Add sveltekit * Split tslib into separate @generated and @tslib components SvelteKit's path aliases don't support multiple locations, so our old approach of using @tslib to refer to both ts/lib and out/ts/lib will no longer work. Instead, all generated sources and their includes are placed in a separate out/ts/generated folder, and imported via @generated instead. This also allows us to generate .ts files, instead of needing to output separate .d.ts and .js files. * Switch package.json to module type * Avoid usage of baseUrl Incompatible with SvelteKit * Move sass into ts; use relative links SvelteKit's default sass support doesn't allow overriding loadPaths * jest->vitest, graphs example working with yarn dev * most pages working in dev mode * Some fixes after rebasing * Fix/silence some svelte-check errors * Get image-occlusion working with Fabric types * Post-rebase lock changes * Editor is now checked * SvelteKit build integrated into ninja * Use the new SvelteKit entrypoint for pages like congrats/deck options/etc * Run eslint once for ts/**; fix some tests * Fix a bunch of issues introduced when rebasing over latest main * Run eslint fix * Fix remaining eslint+pylint issues; tests now all pass * Fix some issues with a clean build * Latest bufbuild no longer requires @__PURE__ hack * Add a few missed dependencies * Add yarn.bat to fix Windows build * Fix pages failing to show when ANKI_API_PORT not defined * Fix svelte-check and vitest on Windows * Set node path in ./yarn * Move svelte-kit output to ts/.svelte-kit Sadly, I couldn't figure out a way to store it in out/ if out/ is a symlink, as it breaks module resolution when SvelteKit is run. * Allow HMR inside Anki * Skip SvelteKit build when HMR is defined * Fix some post-rebase issues I should have done a normal merge instead.
90 lines
2.5 KiB
TypeScript
90 lines
2.5 KiB
TypeScript
// Copyright: Ankitects Pty Ltd and contributors
|
|
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
|
|
import { fabric } from "fabric";
|
|
|
|
import { SHAPE_MASK_COLOR } from "../tools/lib";
|
|
import type { ConstructorParams, Size } from "../types";
|
|
import { floatToDisplay } from "./floats";
|
|
import { xFromNormalized, xToNormalized, yFromNormalized, yToNormalized } from "./position";
|
|
|
|
export type ShapeOrShapes = Shape | Shape[];
|
|
|
|
/** Defines a basic shape that can have its coordinates stored in either
|
|
absolute pixels (relative to a containing canvas), or in normalized 0-1
|
|
form. Can be converted to a fabric object, or to a format suitable for
|
|
storage in a cloze note.
|
|
*/
|
|
export class Shape {
|
|
left: number;
|
|
top: number;
|
|
fill: string = SHAPE_MASK_COLOR;
|
|
/** Whether occlusions from other cloze numbers should be shown on the
|
|
* question side. Used only in reviewer code.
|
|
*/
|
|
occludeInactive?: boolean;
|
|
/* Cloze ordinal */
|
|
ordinal: number | undefined;
|
|
|
|
constructor(
|
|
{ left = 0, top = 0, fill = SHAPE_MASK_COLOR, occludeInactive, ordinal = undefined }: ConstructorParams<Shape> =
|
|
{},
|
|
) {
|
|
this.left = left;
|
|
this.top = top;
|
|
this.fill = fill;
|
|
this.occludeInactive = occludeInactive;
|
|
this.ordinal = ordinal;
|
|
}
|
|
|
|
/** Format numbers and remove default values, for easier serialization to
|
|
* text.
|
|
*/
|
|
toDataForCloze(): ShapeDataForCloze {
|
|
return {
|
|
left: floatToDisplay(this.left),
|
|
top: floatToDisplay(this.top),
|
|
...(this.fill === SHAPE_MASK_COLOR ? {} : { fill: this.fill }),
|
|
};
|
|
}
|
|
|
|
toFabric(size: Size): fabric.Object {
|
|
const absolute = this.toAbsolute(size);
|
|
return new fabric.Object(absolute);
|
|
}
|
|
|
|
normalPosition(size: Size) {
|
|
return {
|
|
left: xToNormalized(size, this.left),
|
|
top: yToNormalized(size, this.top),
|
|
};
|
|
}
|
|
|
|
toNormal(size: Size): Shape {
|
|
return new Shape({
|
|
...this,
|
|
...this.normalPosition(size),
|
|
});
|
|
}
|
|
|
|
absolutePosition(size: Size) {
|
|
return {
|
|
left: xFromNormalized(size, this.left),
|
|
top: yFromNormalized(size, this.top),
|
|
};
|
|
}
|
|
|
|
toAbsolute(size: Size): Shape {
|
|
return new Shape({
|
|
...this,
|
|
...this.absolutePosition(size),
|
|
});
|
|
}
|
|
}
|
|
|
|
export interface ShapeDataForCloze {
|
|
left: string;
|
|
top: string;
|
|
fill?: string;
|
|
oi?: string;
|
|
}
|