@khanacademy/math-input 1.0.1 → 3.0.0

package/CHANGELOG.md

@@ -1,6 +1,30 @@
 # @khanacademy/math-input
 
-## 1.0.1
+## 3.0.0
+
+### Major Changes
+
+-   ec37eb3d: Export v2 keypad, rename v1 keypad to ProvidedKeypad
+
+### Minor Changes
+
+-   46417c53: add division key boolean
+-   97438065: Add prop to Keypad to switch between · and × for multiplication
+-   85d9132a: Added Basic Relations buttons
+-   42297993: Add advanced relations buttons
+-   e86cc72f: Keypad API: Button sets on keypad switched to optional booleans. Added all designed button sets as props, but not all are yet implemented.
+-   c0a15907: adds logarithm buttons
+
+### Patch Changes
+
+-   1ffbe3ef:
+-   d9759ea6: Fix dom errors from SVG markup and adjust stories to remove warnings
+
+## 2.0.0
+
+### Major Changes
+
+-   b585fe29: Switch most @khanacademy/math-input psuedo-enums to enums
 
 ### Patch Changes
 

package/dist/components/input/cursor-contexts.d.ts

@@ -1,5 +1,5 @@
 /**
- * Constants that define the various contexts in which a cursor can exist. The
+ * Enum that defines the various contexts in which a cursor can exist. The
  * active context is determined first by looking at the cursor's siblings (e.g.,
  * for the `BEFORE_FRACTION` context), and then at its direct parent. Though a
  * cursor could in theory be nested in multiple contexts, we only care about the
@@ -9,11 +9,12 @@
  * now, we show the dismiss button rather than allowing the user to jump out of
  * the radical.
  */
-export type CursorContext = "NONE" | "IN_PARENS" | "IN_SUPER_SCRIPT" | "IN_SUB_SCRIPT" | "IN_NUMERATOR" | "IN_DENOMINATOR" | "BEFORE_FRACTION";
-export declare const NONE = "NONE";
-export declare const IN_PARENS = "IN_PARENS";
-export declare const IN_SUPER_SCRIPT = "IN_SUPER_SCRIPT";
-export declare const IN_SUB_SCRIPT = "IN_SUB_SCRIPT";
-export declare const IN_NUMERATOR = "IN_NUMERATOR";
-export declare const IN_DENOMINATOR = "IN_DENOMINATOR";
-export declare const BEFORE_FRACTION = "BEFORE_FRACTION";
+export declare enum CursorContext {
+    NONE = "NONE",
+    IN_PARENS = "IN_PARENS",
+    IN_SUPER_SCRIPT = "IN_SUPER_SCRIPT",
+    IN_SUB_SCRIPT = "IN_SUB_SCRIPT",
+    IN_NUMERATOR = "IN_NUMERATOR",
+    IN_DENOMINATOR = "IN_DENOMINATOR",
+    BEFORE_FRACTION = "BEFORE_FRACTION"
+}

package/dist/components/input/cursor-contexts.js.flow

@@ -5,7 +5,7 @@
  * @flow
  */
 /**
- * Constants that define the various contexts in which a cursor can exist. The
+ * Enum that defines the various contexts in which a cursor can exist. The
  * active context is determined first by looking at the cursor's siblings (e.g.,
  * for the `BEFORE_FRACTION` context), and then at its direct parent. Though a
  * cursor could in theory be nested in multiple contexts, we only care about the
@@ -15,18 +15,13 @@
  * now, we show the dismiss button rather than allowing the user to jump out of
  * the radical.
  */
-export type CursorContext =
-  | "NONE"
-  | "IN_PARENS"
-  | "IN_SUPER_SCRIPT"
-  | "IN_SUB_SCRIPT"
-  | "IN_NUMERATOR"
-  | "IN_DENOMINATOR"
-  | "BEFORE_FRACTION";
-declare export var NONE: "NONE";
-declare export var IN_PARENS: "IN_PARENS";
-declare export var IN_SUPER_SCRIPT: "IN_SUPER_SCRIPT";
-declare export var IN_SUB_SCRIPT: "IN_SUB_SCRIPT";
-declare export var IN_NUMERATOR: "IN_NUMERATOR";
-declare export var IN_DENOMINATOR: "IN_DENOMINATOR";
-declare export var BEFORE_FRACTION: "BEFORE_FRACTION";
+
+declare export var CursorContext: {|
+  +NONE: "NONE", // "NONE"
+  +IN_PARENS: "IN_PARENS", // "IN_PARENS"
+  +IN_SUPER_SCRIPT: "IN_SUPER_SCRIPT", // "IN_SUPER_SCRIPT"
+  +IN_SUB_SCRIPT: "IN_SUB_SCRIPT", // "IN_SUB_SCRIPT"
+  +IN_NUMERATOR: "IN_NUMERATOR", // "IN_NUMERATOR"
+  +IN_DENOMINATOR: "IN_DENOMINATOR", // "IN_DENOMINATOR"
+  +BEFORE_FRACTION: "BEFORE_FRACTION", // "BEFORE_FRACTION"
+|};

package/dist/components/input/math-input.d.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import ProvidedKeypad from "../provided-keypad";
+import ProvidedKeypad from "../keypad-legacy/provided-keypad";
 type Props = {
     keypadElement: ProvidedKeypad;
     onBlur: () => void;

package/dist/components/input/math-input.js.flow

@@ -5,7 +5,7 @@
  * @flow
  */
 import * as React from "react";
-import ProvidedKeypad from "../provided-keypad";
+import ProvidedKeypad from "../keypad-legacy/provided-keypad";
 declare type Props = {|
   keypadElement: ProvidedKeypad,
   onBlur: () => void,

package/dist/components/input/math-wrapper.d.ts

@@ -3,6 +3,7 @@
  * more regular interface for the functionality we need while insulating us
  * from MathQuill changes.
  */
+import { CursorContext } from "./cursor-contexts";
 declare class MathWrapper {
     MQ: any;
     mathField: any;
@@ -18,7 +19,7 @@ declare class MathWrapper {
      * @returns {object} a cursor object, consisting of a cursor context
      */
     pressKey(key: string): {
-        context: string;
+        context: CursorContext;
     };
     /**
      * Place the cursor beside the node located at the given coordinates.
@@ -104,7 +105,7 @@ declare class MathWrapper {
     _handleBackspaceOutsideParens(cursor: any): void;
     _handleBackspaceInsideParens(cursor: any): void;
     _handleBackspaceAfterLigaturedSymbol(cursor: any): void;
-    contextForCursor(cursor: any): "NONE" | "IN_PARENS" | "IN_SUPER_SCRIPT" | "IN_SUB_SCRIPT" | "IN_NUMERATOR" | "IN_DENOMINATOR" | "BEFORE_FRACTION";
+    contextForCursor(cursor: any): CursorContext;
     _isAtTopLevel(cursor: any): boolean;
 }
 export default MathWrapper;

package/dist/components/input/math-wrapper.js.flow

@@ -4,11 +4,7 @@
  * Flowgen v1.21.0
  * @flow
  */
-/**
- * This file contains a wrapper around MathQuill so that we can provide a
- * more regular interface for the functionality we need while insulating us
- * from MathQuill changes.
- */
+import { CursorContext } from "./cursor-contexts";
 declare class MathWrapper {
   MQ: any;
   mathField: any;
@@ -24,7 +20,7 @@ declare class MathWrapper {
    * @returns {{...}} a cursor object, consisting of a cursor context
    */
   pressKey(key: string): {|
-    context: string,
+    context: CursorContext,
   |};
 
   /**
@@ -110,16 +106,7 @@ declare class MathWrapper {
   _handleBackspaceOutsideParens(cursor: any): void;
   _handleBackspaceInsideParens(cursor: any): void;
   _handleBackspaceAfterLigaturedSymbol(cursor: any): void;
-  contextForCursor(
-    cursor: any
-  ):
-    | "NONE"
-    | "IN_PARENS"
-    | "IN_SUPER_SCRIPT"
-    | "IN_SUB_SCRIPT"
-    | "IN_NUMERATOR"
-    | "IN_DENOMINATOR"
-    | "BEFORE_FRACTION";
+  contextForCursor(cursor: any): CursorContext;
   _isAtTopLevel(cursor: any): boolean;
 }
 declare export default typeof MathWrapper;

package/dist/components/keypad/button.d.ts

@@ -1,6 +1,6 @@
 import * as React from "react";
 import type { StyleType } from "@khanacademy/wonder-blocks-core";
-type Props = {
+export type Props = {
     onPress: () => void;
     children: React.ReactNode;
     style?: StyleType;
@@ -9,4 +9,3 @@ type Props = {
 export default class Button extends React.Component<Props> {
     render(): React.ReactNode;
 }
-export {};

package/dist/components/keypad/button.js.flow

@@ -6,7 +6,7 @@
  */
 import * as React from "react";
 import type { StyleType } from "@khanacademy/wonder-blocks-core";
-declare type Props = {|
+export type Props = {|
   onPress: () => void,
   children: React.Node,
   style?: StyleType,

package/dist/components/keypad/{pre-algebra-page.d.ts → geometry-page/index.d.ts}

@@ -2,7 +2,7 @@ import * as React from "react";
 type Props = {
     onClickKey: (keyConfig: string) => void;
 };
-export default class PreAlgebraPage extends React.Component<Props> {
+export default class GeometryPage extends React.Component<Props> {
     render(): React.ReactNode;
 }
 export {};

package/dist/components/keypad/{pre-algebra-page.js.flow → geometry-page/index.js.flow}

@@ -8,6 +8,6 @@ import * as React from "react";
 declare type Props = {|
   onClickKey: (keyConfig: string) => void,
 |};
-declare export default class PreAlgebraPage extends React.Component<Props> {
+declare export default class GeometryPage extends React.Component<Props> {
   render(): React.Node;
 }

package/dist/components/keypad/index.d.ts

@@ -1,10 +1,11 @@
 import * as React from "react";
+import { NumbersPageOptions } from "./numbers-page/types";
+import { OperatorsButtonSets } from "./operators-page/types";
 import type { TabbarItemType } from "../tabbar/types";
-type Props = {
+export type Props = {
     onClickKey: (keyConfig: string) => void;
-    preAlgebra: boolean;
-    trigonometry: boolean;
-};
+    trigonometry?: boolean;
+} & OperatorsButtonSets & NumbersPageOptions;
 type State = {
     selectedPage: TabbarItemType;
 };

package/dist/components/keypad/index.js.flow

@@ -5,11 +5,16 @@
  * @flow
  */
 import * as React from "react";
+import { NumbersPageOptions } from "./numbers-page/types";
+import { OperatorsButtonSets } from "./operators-page/types";
 import type { TabbarItemType } from "../tabbar/types";
-declare type Props = {|
-  onClickKey: (keyConfig: string) => void,
-  preAlgebra: boolean,
-  trigonometry: boolean,
+export type Props = {|
+  ...{|
+    onClickKey: (keyConfig: string) => void,
+    trigonometry?: boolean,
+  |},
+  ...OperatorsButtonSets,
+  ...NumbersPageOptions,
 |};
 declare type State = {|
   selectedPage: TabbarItemType,

package/dist/components/keypad/keypad-page-items.d.ts

@@ -5,7 +5,7 @@ type KeypadPageContainerProps = {
     children: React.ReactNode;
 };
 export declare const KeypadPageContainer: ({ children, }: KeypadPageContainerProps) => React.ReactElement;
-type KeypadButtonProps = {
+export type KeypadButtonProps = {
     keyConfig: KeyConfig;
     tintColor?: string;
     style?: StyleType;
@@ -24,5 +24,11 @@ type KeypadActionButtonProps = {
     onClickKey: (keyConfig: string) => void;
 };
 export declare const KeypadActionButton: ({ keyConfig, onClickKey, style, }: KeypadActionButtonProps) => React.ReactElement;
-export declare const PlaceHolderButton: () => React.ReactElement;
+/**
+ * A placeholder button for the keypad. Optional count prop to render multiple
+ * buttons. Defaults to 1.
+ */
+export declare const PlaceHolderButtons: ({ count, }: {
+    count?: number | undefined;
+}) => React.ReactElement;
 export {};

package/dist/components/keypad/keypad-page-items.js.flow

@@ -13,7 +13,7 @@ declare type KeypadPageContainerProps = {|
 declare export var KeypadPageContainer: (
   x: KeypadPageContainerProps
 ) => React.Element<any>;
-declare type KeypadButtonProps = {|
+export type KeypadButtonProps = {|
   keyConfig: KeyConfig,
   tintColor?: string,
   style?: StyleType,
@@ -36,4 +36,10 @@ declare type KeypadActionButtonProps = {|
 declare export var KeypadActionButton: (
   x: KeypadActionButtonProps
 ) => React.Element<any>;
-declare export var PlaceHolderButton: () => React.Element<any>;
+/**
+ * A placeholder button for the keypad. Optional count prop to render multiple
+ * buttons. Defaults to 1.
+ */
+declare export var PlaceHolderButtons: (x: {|
+  count?: number | void,
+|}) => React.Element<any>;

package/dist/components/keypad/{numeric-input-page.d.ts → numbers-page/index.d.ts}

@@ -1,8 +1,9 @@
 import * as React from "react";
+import { NumbersPageOptions } from "./types";
 type Props = {
     onClickKey: (keyConfig: string) => void;
-};
-export default class NumericInputPage extends React.Component<Props> {
+} & NumbersPageOptions;
+export default class NumbersPage extends React.Component<Props> {
     render(): React.ReactNode;
 }
 export {};

package/dist/components/keypad/numbers-page/index.js.flow

@@ -0,0 +1,17 @@
+/**
+ * Flowtype definitions for data
+ * Generated by Flowgen from a Typescript Definition
+ * Flowgen v1.21.0
+ * @flow
+ */
+import * as React from "react";
+import { NumbersPageOptions } from "./types";
+declare type Props = {|
+  ...{|
+    onClickKey: (keyConfig: string) => void,
+  |},
+  ...NumbersPageOptions,
+|};
+declare export default class NumbersPage extends React.Component<Props> {
+  render(): React.Node;
+}

package/dist/components/keypad/numbers-page/types.d.ts

@@ -0,0 +1,4 @@
+export type NumbersPageOptions = {
+    multiplicationDot?: boolean;
+    divisionKey?: boolean;
+};

package/dist/components/keypad/numbers-page/types.js.flow

@@ -0,0 +1,10 @@
+/**
+ * Flowtype definitions for data
+ * Generated by Flowgen from a Typescript Definition
+ * Flowgen v1.21.0
+ * @flow
+ */
+export type NumbersPageOptions = {|
+  multiplicationDot?: boolean,
+  divisionKey?: boolean,
+|};

package/dist/components/keypad/operators-page/advanced-relations-buttons.d.ts

@@ -0,0 +1,7 @@
+import React from "react";
+type Props = {
+    onClickKey: (keyConfig: string) => void;
+    placeholder?: boolean;
+};
+export declare const AdvancedRelations: ({ onClickKey, placeholder, }: Props) => React.ReactElement;
+export {};

package/dist/components/keypad/{numeric-input-page.js.flow → operators-page/advanced-relations-buttons.js.flow}

@@ -4,10 +4,9 @@
  * Flowgen v1.21.0
  * @flow
  */
-import * as React from "react";
+import React from "react";
 declare type Props = {|
   onClickKey: (keyConfig: string) => void,
+  placeholder?: boolean,
 |};
-declare export default class NumericInputPage extends React.Component<Props> {
-  render(): React.Node;
-}
+declare export var AdvancedRelations: (x: Props) => React.ReactElement;

package/dist/components/keypad/operators-page/basic-relations-buttons.d.ts

@@ -0,0 +1,7 @@
+import React from "react";
+type Props = {
+    onClickKey: (keyConfig: string) => void;
+    placeholder?: boolean;
+};
+export declare const BasicRelations: ({ onClickKey, placeholder, }: Props) => React.ReactElement;
+export {};

package/dist/components/keypad/{trigonometry-page.js.flow → operators-page/basic-relations-buttons.js.flow}

@@ -4,12 +4,9 @@
  * Flowgen v1.21.0
  * @flow
  */
-import * as React from "react";
+import React from "react";
 declare type Props = {|
   onClickKey: (keyConfig: string) => void,
+  placeholder?: boolean,
 |};
-declare export default class TrigonometryInputPage
-  extends React.Component<Props>
-{
-  render(): React.Node;
-}
+declare export var BasicRelations: (x: Props) => React.ReactElement;

package/dist/components/keypad/operators-page/index.d.ts

@@ -0,0 +1,9 @@
+import * as React from "react";
+import { OperatorsButtonSets } from "./types";
+type Props = {
+    onClickKey: (keyConfig: string) => void;
+} & OperatorsButtonSets;
+export default class OperatorsPage extends React.Component<Props> {
+    render(): React.ReactNode;
+}
+export {};

package/dist/components/keypad/operators-page/index.js.flow

@@ -0,0 +1,17 @@
+/**
+ * Flowtype definitions for data
+ * Generated by Flowgen from a Typescript Definition
+ * Flowgen v1.21.0
+ * @flow
+ */
+import * as React from "react";
+import { OperatorsButtonSets } from "./types";
+declare type Props = {|
+  ...{|
+    onClickKey: (keyConfig: string) => void,
+  |},
+  ...OperatorsButtonSets,
+|};
+declare export default class OperatorsPage extends React.Component<Props> {
+  render(): React.Node;
+}

package/dist/components/keypad/operators-page/logarithms-buttons.d.ts

@@ -0,0 +1,7 @@
+import React from "react";
+type Props = {
+    onClickKey: (keyConfig: string) => void;
+    placeholder?: boolean;
+};
+export declare const Logarithms: ({ onClickKey, placeholder, }: Props) => React.ReactElement;
+export {};

package/dist/components/keypad/operators-page/logarithms-buttons.js.flow

@@ -0,0 +1,12 @@
+/**
+ * Flowtype definitions for data
+ * Generated by Flowgen from a Typescript Definition
+ * Flowgen v1.21.0
+ * @flow
+ */
+import React from "react";
+declare type Props = {|
+  onClickKey: (keyConfig: string) => void,
+  placeholder?: boolean,
+|};
+declare export var Logarithms: (x: Props) => React.ReactElement;

package/dist/components/keypad/operators-page/pre-algebra-buttons.d.ts

@@ -0,0 +1,7 @@
+import React from "react";
+type Props = {
+    onClickKey: (keyConfig: string) => void;
+    placeholder?: boolean;
+};
+export declare const PreAlgebra: ({ onClickKey, placeholder, }: Props) => React.ReactElement;
+export {};

package/dist/components/keypad/operators-page/pre-algebra-buttons.js.flow

@@ -0,0 +1,12 @@
+/**
+ * Flowtype definitions for data
+ * Generated by Flowgen from a Typescript Definition
+ * Flowgen v1.21.0
+ * @flow
+ */
+import React from "react";
+declare type Props = {|
+  onClickKey: (keyConfig: string) => void,
+  placeholder?: boolean,
+|};
+declare export var PreAlgebra: (x: Props) => React.ReactElement;

package/dist/components/keypad/operators-page/types.d.ts

@@ -0,0 +1,6 @@
+export type OperatorsButtonSets = {
+    preAlgebra?: boolean;
+    logarithms?: boolean;
+    basicRelations?: boolean;
+    advancedRelations?: boolean;
+};

package/dist/components/keypad/operators-page/types.js.flow

@@ -0,0 +1,12 @@
+/**
+ * Flowtype definitions for data
+ * Generated by Flowgen from a Typescript Definition
+ * Flowgen v1.21.0
+ * @flow
+ */
+export type OperatorsButtonSets = {|
+  preAlgebra?: boolean,
+  logarithms?: boolean,
+  basicRelations?: boolean,
+  advancedRelations?: boolean,
+|};

package/dist/components/{compute-layout-parameters.d.ts → keypad-legacy/compute-layout-parameters.d.ts}

@@ -18,6 +18,7 @@
  * to be conservative in our measurements and make things smaller than they
  * might need to be.
  */
+import { LayoutMode } from "../../enums";
 export declare const computeLayoutParameters: ({ numColumns, numMaxVisibleRows, numPages }: {
     numColumns: any;
     numMaxVisibleRows: any;
@@ -34,5 +35,5 @@ export declare const computeLayoutParameters: ({ numColumns, numMaxVisibleRows,
     toolbarEnabled: any;
 }) => {
     buttonDimensions: any;
-    layoutMode: "FULLSCREEN" | "COMPACT";
+    layoutMode: LayoutMode;
 };

package/dist/components/keypad-legacy/compute-layout-parameters.js.flow

@@ -0,0 +1,30 @@
+/**
+ * Flowtype definitions for data
+ * Generated by Flowgen from a Typescript Definition
+ * Flowgen v1.21.0
+ * @flow
+ */
+import { LayoutMode } from "../../enums";
+declare export var computeLayoutParameters: (
+  x: {|
+    numColumns: any,
+    numMaxVisibleRows: any,
+    numPages: any,
+  |},
+  x: {|
+    pageWidthPx: any,
+    pageHeightPx: any,
+  |},
+  x: {|
+    deviceOrientation: any,
+    deviceType: any,
+  |},
+  x: {|
+    navigationPadEnabled: any,
+    paginationEnabled: any,
+    toolbarEnabled: any,
+  |}
+) => {|
+  buttonDimensions: any,
+  layoutMode: LayoutMode,
+|};

package/dist/components/{echo-manager.d.ts → keypad-legacy/echo-manager.d.ts}

@@ -2,18 +2,9 @@
  * A component that renders and animates the selection state effect effect.
  */
 import * as React from "react";
-import { EchoAnimationTypes } from "../consts";
-import type { Key } from "../data/keys";
-import type { Border, Bound } from "../types";
-type EchoPropType = {
-    animationId: string;
-    animationType: keyof typeof EchoAnimationTypes;
-    borders: Border;
-    id: Key;
-    initialBounds: Bound;
-};
+import type { Echo as EchoType } from "../../types";
 type EchoManagerProps = {
-    echoes: ReadonlyArray<EchoPropType>;
+    echoes: ReadonlyArray<EchoType>;
     onAnimationFinish?: (animationId: string) => void;
 };
 declare class EchoManager extends React.Component<EchoManagerProps> {

package/dist/components/{echo-manager.js.flow → keypad-legacy/echo-manager.js.flow}

@@ -5,18 +5,9 @@
  * @flow
  */
 import * as React from "react";
-import { EchoAnimationTypes } from "../consts";
-import type { Key } from "../data/keys";
-import type { Border, Bound } from "../types";
-declare type EchoPropType = {|
-  animationId: string,
-  animationType: $Keys<typeof EchoAnimationTypes>,
-  borders: Border,
-  id: Key,
-  initialBounds: Bound,
-|};
+import type { Echo as EchoType } from "../../types";
 declare type EchoManagerProps = {|
-  echoes: $ReadOnlyArray<EchoPropType>,
+  echoes: $ReadOnlyArray<EchoType>,
   onAnimationFinish?: (animationId: string) => void,
 |};
 declare class EchoManager extends React.Component<EchoManagerProps> {

package/dist/components/{expression-keypad.d.ts → keypad-legacy/expression-keypad.d.ts}

@@ -2,10 +2,9 @@
  * A keypad that includes all of the expression symbols.
  */
 import * as React from "react";
-import type { KeypadLayout } from "../types";
-import type { CursorContext } from "./input/cursor-contexts";
+import { CursorContext } from "../input/cursor-contexts";
+import type { KeypadLayout } from "../../types";
 interface ReduxProps {
-    currentPage: number;
     cursorContext?: CursorContext;
     dynamicJumpOut: boolean;
 }
@@ -18,5 +17,5 @@ export declare const expressionKeypadLayout: KeypadLayout;
 declare class ExpressionKeypad extends React.Component<Props> {
     render(): JSX.Element;
 }
-declare const _default: import("react-redux").ConnectedComponent<typeof ExpressionKeypad, import("react-redux").Omit<React.ClassAttributes<ExpressionKeypad> & Props, "currentPage" | "cursorContext" | "dynamicJumpOut">>;
+declare const _default: import("react-redux").ConnectedComponent<typeof ExpressionKeypad, import("react-redux").Omit<React.ClassAttributes<ExpressionKeypad> & Props, "cursorContext" | "dynamicJumpOut">>;
 export default _default;

package/dist/components/{expression-keypad.js.flow → keypad-legacy/expression-keypad.js.flow}

@@ -6,10 +6,9 @@
  */
 import * as $Flowgen$Import$react_2d_redux from "react-redux";
 import * as React from "react";
-import type { KeypadLayout } from "../types";
-import type { CursorContext } from "./input/cursor-contexts";
+import { CursorContext } from "../input/cursor-contexts";
+import type { KeypadLayout } from "../../types";
 declare interface ReduxProps {
-  currentPage: number;
   cursorContext?: CursorContext;
   dynamicJumpOut: boolean;
 }
@@ -26,7 +25,7 @@ declare var _default: $Flowgen$Import$react_2d_redux.ConnectedComponent<
   typeof ExpressionKeypad,
   $Flowgen$Import$react_2d_redux.Omit<
     {| ...React.ClassAttributes<ExpressionKeypad>, ...Props |},
-    "currentPage" | "cursorContext" | "dynamicJumpOut"
+    "cursorContext" | "dynamicJumpOut"
   >
 >;
 declare export default typeof _default;

package/dist/components/{fraction-keypad.d.ts → keypad-legacy/fraction-keypad.d.ts}

@@ -3,8 +3,8 @@
  * with fractions, decimals, and percents.
  */
 import * as React from "react";
-import type { KeypadLayout } from "../types";
-import type { CursorContext } from "./input/cursor-contexts";
+import { CursorContext } from "../input/cursor-contexts";
+import type { KeypadLayout } from "../../types";
 interface ReduxProps {
     cursorContext?: CursorContext;
     dynamicJumpOut: boolean;