@khanacademy/perseus 19.1.4 → 19.1.6

package/src/interactive2/objective_.ts

@@ -1,79 +0,0 @@
-/**
- * A work-in-progress of _ methods for objects.
- * That is, they take an object as a parameter,
- * and return an object instead of an array.
- *
- * TODO(aria): Move this out of interactive2
- */
-
-import _ from "underscore";
-
-/**
- * Does a pluck on keys inside objects in an object
- *
- * Ex:
- * tools = {
- *     translation: {
- *         enabled: true
- *     },
- *     rotation: {
- *         enabled: false
- *     }
- * };
- * pluckObject(tools, "enabled") returns {
- *     translation: true
- *     rotation: false
- * }
- */
-const pluck = function (table: any, subKey: string): any {
-    return _.object(
-        _.map(table, function (value, key) {
-            return [key, value[subKey]];
-        }),
-    );
-};
-
-/**
- * Maps an object to an object
- *
- * > mapObject({a: '1', b: '2'}, (value, key) => {
- *       return value + 1;
- *   });
- * {a: 2, b: 3}
- */
-const mapObject = function <K extends string, V, U>(
-    obj: Partial<Record<K, V>>,
-    lambda: (arg1: V, arg2: K) => U,
-): Partial<Record<K, U>> {
-    const result: Record<string, any> = {};
-    _.each(_.keys(obj), function (key) {
-        // @ts-expect-error - TS2345 - Argument of type 'string' is not assignable to parameter of type 'K'.
-        result[key] = lambda(obj[key], key);
-    });
-    return result;
-};
-
-/**
- * Maps an array to an object
- *
- * > mapObjectFromArray(['a', 'b'], function(elem) {
- *       return elem + elem;
- *   });
- * {a: 'aa', b: 'bb'}
- */
-const mapObjectFromArray = function <K extends string, V>(
-    arr: ReadonlyArray<K>,
-    lambda: (arg1: K) => V,
-): Partial<Record<K, V>> {
-    const result: Record<string, any> = {};
-    _.each(arr, function (elem) {
-        result[elem] = lambda(elem);
-    });
-    return result;
-};
-
-export default {
-    pluck: pluck,
-    mapObject: mapObject,
-    mapObjectFromArray: mapObjectFromArray,
-};

package/src/interactive2/types.ts

@@ -1,2 +0,0 @@
-export type Coord = [number, number]; // x, y
-export type Line = [Coord, Coord]; // start, end

package/src/interactive2/wrapped-defaults.ts

@@ -1,87 +0,0 @@
-/* eslint-disable @babel/no-invalid-this */
-/**
- * Default methods for a wrapped movable.
- */
-
-import {vector as kvector} from "@khanacademy/kmath";
-import $ from "jquery";
-import _ from "underscore";
-
-import InteractiveUtil from "./interactive-util";
-import objective_ from "./objective_";
-
-/*
- * These functions, when called on the wrapped object, simply pass the
- * arguments to the underlying Raphael object.
- */
-const PASS_TO_RAPHAEL = ["attr", "animate"];
-
-const WrappedDefaults: any = _.extend(
-    {
-        transform: function (transformation) {
-            const prefixedTransform = InteractiveUtil.getPrefixedTransform();
-            // @ts-expect-error - TS2538 - Type 'null' cannot be used as an index type. | TS2538 - Type 'undefined' cannot be used as an index type.
-            this.wrapper.style[prefixedTransform] = transformation;
-        },
-
-        toFront: function () {
-            const parentNode = this.wrapper.parentNode;
-            // TODO(emily): Sometimes, we call `.remove()` but then hold a
-            // reference to this object, and sometimes call `.toFront` on it.
-            // Notably, this happens in the reflection transformation in the
-            // Transformer widget. This is a hacky fix. Make this less bad.
-            if (parentNode) {
-                parentNode.appendChild(this.wrapper);
-            }
-        },
-
-        toBack: function () {
-            const parentNode = this.wrapper.parentNode;
-            if (parentNode.firstChild !== this.wrapper) {
-                parentNode.insertBefore(this.wrapper, parentNode.firstChild);
-            }
-        },
-
-        remove: function () {
-            this.visibleShape.remove();
-            $(this.wrapper).remove();
-        },
-
-        getMouseTarget: function () {
-            return this.visibleShape[0];
-        },
-
-        moveTo: function (point) {
-            const delta = kvector.subtract(
-                this.graphie.scalePoint(point),
-                this.graphie.scalePoint(this.initialPoint),
-            );
-            const do3dTransform = InteractiveUtil.getCanUse3dTransform();
-            const transformation =
-                "translateX(" +
-                delta[0] +
-                "px) " +
-                "translateY(" +
-                delta[1] +
-                "px)" +
-                (do3dTransform ? " translateZ(0)" : "");
-            this.transform(transformation);
-        },
-
-        hide: function () {
-            this.visibleShape.hide();
-        },
-
-        show: function () {
-            this.visibleShape.show();
-        },
-    },
-    objective_.mapObjectFromArray(PASS_TO_RAPHAEL, function (attribute) {
-        return function (...args) {
-            // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-            this.visibleShape[attribute](...args);
-        };
-    }),
-);
-
-export default WrappedDefaults;

package/src/interactive2/wrapped-ellipse.ts

@@ -1,94 +0,0 @@
-import {vector as kvector} from "@khanacademy/kmath";
-import _ from "underscore";
-
-import InteractiveUtil from "./interactive-util";
-import WrappedDefaults from "./wrapped-defaults";
-
-import type {Coord} from "./types";
-
-const DEFAULT_OPTIONS = {
-    maxScale: 1,
-    mouselayer: false,
-    shadow: false,
-    disableMouseEventsOnWrapper: false,
-} as const;
-
-const WrappedEllipse = function (
-    graphie: any,
-    center: Coord,
-    radii: [number, number],
-    options: any,
-) {
-    options = _.extend({}, DEFAULT_OPTIONS, options);
-
-    // Add `wrapper`, `visibleShape`, and remaining properties.
-    const fixedEllipse = graphie.fixedEllipse(
-        center,
-        radii,
-        options.maxScale,
-        options.padding,
-    );
-    // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-    _.extend(this, fixedEllipse, {
-        graphie: graphie,
-        initialPoint: center,
-    });
-
-    if (options.interactiveKindForTesting) {
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.wrapper.setAttribute(
-            "data-interactive-kind-for-testing",
-            options.interactiveKindForTesting,
-        );
-    }
-
-    // Add to appropriate graphie layer
-    if (options.mouselayer) {
-        // Disable browser handling of all panning and zooming gestures on the
-        // movable wrapper so that when moved the browser does not scroll page
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.wrapper.style.touchAction = "none";
-
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation. | TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.graphie.addToMouseLayerWrapper(this.wrapper);
-    } else {
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation. | TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.graphie.addToVisibleLayerWrapper(this.wrapper);
-    }
-
-    if (options.shadow) {
-        const filter = "drop-shadow(0px 0px 5px rgba(0, 0, 0, 0.5))";
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        const wrapper = this.wrapper;
-        wrapper.style.filter = filter;
-
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.moveTo = function (point: any) {
-            const delta = kvector.subtract(
-                this.graphie.scalePoint(point),
-                this.graphie.scalePoint(this.initialPoint),
-            );
-            const do3dTransform = InteractiveUtil.getCanUse3dTransform();
-            const transform =
-                "translateX(" +
-                Math.round(delta[0]) +
-                "px) " +
-                "translateY(" +
-                Math.round(delta[1]) +
-                "px)" +
-                (do3dTransform ? " translateZ(0)" : "");
-            this.transform(transform);
-        };
-    }
-
-    if (options.disableMouseEventsOnWrapper) {
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.wrapper.style.pointerEvents = "none";
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.visibleShape.node.style.pointerEvents = "auto";
-    }
-};
-
-_.extend(WrappedEllipse.prototype, WrappedDefaults);
-
-export default WrappedEllipse;

package/src/interactive2/wrapped-line.ts

@@ -1,116 +0,0 @@
-import {point as kpoint, vector as kvector} from "@khanacademy/kmath";
-import _ from "underscore";
-
-import KhanMath from "../util/math";
-
-import InteractiveUtil from "./interactive-util";
-import WrappedDefaults from "./wrapped-defaults";
-
-import type {Coord} from "./types";
-
-const DEFAULT_OPTIONS = {
-    thickness: 2,
-    mouselayer: false,
-} as const;
-
-const WrappedLine = function (
-    graphie: any,
-    start: Coord,
-    end: Coord,
-    options: any,
-) {
-    options = _.extend({}, DEFAULT_OPTIONS, options);
-
-    // Always make the line as large as possible and horizontal; this
-    // simplifies a lot of the transforms, e.g., we can rotate by exactly the
-    // angle of the argument points in `moveTo`.
-    const initialStart = [graphie.range[0][0], 0];
-    const initialEnd = [graphie.range[0][1], 0];
-
-    // Add `wrapper` and `visibleShape`
-    _.extend(
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this,
-        graphie.fixedLine(initialStart, initialEnd, options.thickness),
-    );
-
-    if (options.interactiveKindForTesting) {
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.wrapper.setAttribute(
-            "data-interactive-kind-for-testing",
-            options.interactiveKindForTesting,
-        );
-    }
-
-    // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-    this.visibleShape.attr(options.normalStyle);
-
-    // Save properties for computing transformations
-    // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-    _.extend(this, {
-        graphie: graphie,
-        initialPoint: graphie.scalePoint(initialStart),
-        initialLength: kpoint.distanceToPoint(
-            graphie.scalePoint(initialStart),
-            graphie.scalePoint(initialEnd),
-        ),
-    });
-
-    // Add to appropriate graphie layer
-    if (options.mouselayer) {
-        // Disable browser handling of all panning and zooming gestures on the
-        // movable wrapper so that when moved the browser does not scroll page
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.wrapper.style.touchAction = "none";
-
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation. | TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.graphie.addToMouseLayerWrapper(this.wrapper);
-    } else {
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation. | TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.graphie.addToVisibleLayerWrapper(this.wrapper);
-    }
-
-    // Move to argument points
-    // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-    this.moveTo(start, end);
-};
-
-_.extend(WrappedLine.prototype, WrappedDefaults, {
-    getMouseTarget: function () {
-        return this.wrapper;
-    },
-
-    moveTo: function (start, end) {
-        const scaledStart = this.graphie.scalePoint(start);
-        const scaledEnd = this.graphie.scalePoint(end);
-
-        // Compute transformation parameters
-        const polarDiff = kvector.polarDegFromCart(
-            kvector.subtract(scaledEnd, scaledStart),
-        );
-        const lineLength = polarDiff[0];
-        const angle = KhanMath.bound(polarDiff[1]);
-        const delta = kvector.subtract(scaledStart, this.initialPoint);
-        const scale = KhanMath.bound(lineLength / this.initialLength);
-
-        // Construct and apply transformation string
-        const do3dTransform = InteractiveUtil.getCanUse3dTransform();
-        const transformation =
-            "translateX(" +
-            delta[0] +
-            "px) " +
-            "translateY(" +
-            delta[1] +
-            "px) " +
-            (do3dTransform ? " translateZ(0)" : "") +
-            "rotate(" +
-            angle +
-            "deg) " +
-            "scaleX(" +
-            scale +
-            ") scaleY(1)";
-        this.transform(transformation);
-    },
-});
-
-export default WrappedLine;

package/src/interactive2/wrapped-path.ts

@@ -1,51 +0,0 @@
-import _ from "underscore";
-
-import WrappedDefaults from "./wrapped-defaults";
-
-import type {Coord} from "./types";
-
-const DEFAULT_OPTIONS = {
-    center: null, // gets ignored in `graphie.fixedPath` if `null`
-    createPath: null, // gets defaulted in `graphie.fixedPath` if `null`
-    mouselayer: false,
-} as const;
-
-const WrappedPath = function (
-    graphie: any,
-    points: ReadonlyArray<Coord>,
-    options: any,
-) {
-    options = _.extend({}, DEFAULT_OPTIONS, options);
-
-    // Add `wrapper` and `visibleShape`
-    _.extend(
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this,
-        graphie.fixedPath(points, options.center, options.createPath),
-    );
-
-    // Add remaining properties
-    // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-    _.extend(this, {
-        graphie: graphie,
-        initialPoint: graphie.scalePoint(_.head(points)),
-    });
-
-    // Add to appropriate graphie layer
-    if (options.mouselayer) {
-        // Disable browser handling of all panning and zooming gestures on the
-        // movable wrapper so that when moved the browser does not scroll page
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.wrapper.style.touchAction = "none";
-
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation. | TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.graphie.addToMouseLayerWrapper(this.wrapper);
-    } else {
-        // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation. | TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-        this.graphie.addToVisibleLayerWrapper(this.wrapper);
-    }
-};
-
-_.extend(WrappedPath.prototype, WrappedDefaults);
-
-export default WrappedPath;

package/src/interactive2.ts

@@ -1,70 +0,0 @@
-import Movable from "./interactive2/movable";
-import MovableLine from "./interactive2/movable-line";
-import MovablePoint from "./interactive2/movable-point";
-import MovablePolygon from "./interactive2/movable-polygon";
-import KhanColors from "./util/colors";
-
-const Interactive2 = {
-    MovablePoint: MovablePoint,
-    addMovablePoint: function (graphie: any, options: any): any {
-        const movable = new Movable(graphie, {});
-        return new MovablePoint(graphie, movable, options);
-    },
-    MovableLine: MovableLine,
-    addMovableLine: function (graphie: any, options: any): any {
-        const movable = new Movable(graphie, {});
-        return new MovableLine(graphie, movable, options);
-    },
-    MovablePolygon: MovablePolygon,
-    addMovablePolygon: function (graphie: any, options: any): any {
-        const movable = new Movable(graphie, {});
-        return new MovablePolygon(graphie, movable, options);
-    },
-
-    addMaybeMobileMovablePoint: function (widget: any, extraProps: any): any {
-        const isMobile = widget.props.apiOptions.isMobile;
-
-        const commonStyle = isMobile
-            ? {
-                  stroke: "#ffffff",
-                  "stroke-width": 3,
-                  fill: KhanColors.INTERACTIVE,
-              }
-            : {
-                  stroke: KhanColors.INTERACTIVE,
-                  fill: KhanColors.INTERACTIVE,
-              };
-
-        const normalStyle = Object.assign(commonStyle, extraProps.normalStyle);
-
-        const highlightStyle = Object.assign(
-            isMobile
-                ? {
-                      ...commonStyle,
-                      "stroke-width": 0,
-                      scale: 0.75,
-                  }
-                : {},
-            extraProps.highlightStyle,
-        );
-
-        const props = Object.assign(
-            {
-                normalStyle: normalStyle,
-                highlightStyle: highlightStyle,
-                shadow: isMobile,
-                tooltip: isMobile && widget.props.showTooltips,
-                showHairlines: widget.showHairlines,
-                hideHairlines: widget.hideHairlines,
-            },
-            isMobile ? {pointSize: 7} : {},
-        );
-
-        return Interactive2.addMovablePoint(
-            widget.graphie,
-            Object.assign(extraProps, props),
-        );
-    },
-} as const;
-
-export default Interactive2;

package/src/item-version.ts

@@ -1,10 +0,0 @@
-import allWidgets from "./all-widgets";
-import {itemDataVersion} from "./perseus-version";
-import * as Widgets from "./widgets";
-
-Widgets.registerWidgets(allWidgets);
-
-const ItemVersion = Widgets.getVersionVector();
-ItemVersion["::renderer::"] = itemDataVersion;
-
-export default ItemVersion;

package/src/jipt-paragraphs.ts

@@ -1,49 +0,0 @@
-/**
- * Paragraph parsing/splitting for article jipt i18n
- */
-
-import SimpleMarkdown from "@khanacademy/simple-markdown";
-
-import type {ParserRules} from "@khanacademy/simple-markdown";
-
-const arrayRules: ParserRules = {
-    fence: {
-        match: SimpleMarkdown.defaultRules.fence.match,
-        order: 1,
-        parse: (capture, state, parse) => ({
-            type: "codeBlock",
-            lang: capture[2] || undefined,
-            content: capture[3],
-        }),
-    },
-    paragraph: {
-        match: SimpleMarkdown.defaultRules.paragraph.match,
-        order: 2,
-        parse: (capture, state, parse) => ({
-            content: capture[1],
-        }),
-    },
-};
-
-const builtArrayParser: ReturnType<typeof SimpleMarkdown.parserFor> =
-    SimpleMarkdown.parserFor(arrayRules);
-
-// This should just return an array of strings! magick!
-const parseToArray = (source: string): Array<string> => {
-    // Remove any leading newlines to avoid splitting weirdness
-    // (simple-markdown has the `newline` rule for this, and i have
-    // no idea how this will handle leading newlines without that rule),
-    // and add \n\n to let it parse at a block/paragraph level
-    const paragraphedSource = source.replace(/^\n\s*\n/, "") + "\n\n";
-    return builtArrayParser(paragraphedSource, {inline: false}).map((c) => {
-        return c["content"];
-    });
-};
-
-const joinFromArray = (paragraphs: ReadonlyArray<string>): string =>
-    paragraphs.join("\n\n");
-
-export default {
-    parseToArray: parseToArray,
-    joinFromArray: joinFromArray,
-};