@khanacademy/math-input 0.4.1 → 0.5.2

package/src/components/expression-keypad.js

@@ -0,0 +1,323 @@
+/**
+ * A keypad that includes all of the expression symbols.
+ */
+
+import {StyleSheet} from "aphrodite";
+import PropTypes from "prop-types";
+import * as React from "react";
+import {connect} from "react-redux";
+
+import {BorderStyles} from "../consts.js";
+import KeyConfigs from "../data/key-configs.js";
+import {View} from "../fake-react-native-web/index.js";
+
+import {valueGrey, controlGrey} from "./common-style.js";
+import * as CursorContexts from "./input/cursor-contexts.js";
+import ManyKeypadButton from "./many-keypad-button.js";
+import {cursorContextPropType, keyIdPropType} from "./prop-types.js";
+import Styles from "./styles.js";
+import TouchableKeypadButton from "./touchable-keypad-button.js";
+import TwoPageKeypad from "./two-page-keypad.js";
+
+const {row, column, oneColumn, fullWidth, roundedTopLeft, roundedTopRight} =
+    Styles;
+
+class ExpressionKeypad extends React.Component {
+    static propTypes = {
+        currentPage: PropTypes.number.isRequired,
+        cursorContext: cursorContextPropType.isRequired,
+        dynamicJumpOut: PropTypes.bool,
+        extraKeys: PropTypes.arrayOf(keyIdPropType),
+        roundTopLeft: PropTypes.bool,
+        roundTopRight: PropTypes.bool,
+    };
+
+    static rows = 4;
+    static columns = 5;
+
+    // Though we include an infinite-key popover in the bottom-left, it's
+    // assumed that we don't need to accommodate cases in which that key
+    // contains more than four children.
+    static maxVisibleRows = 4;
+
+    static numPages = 2;
+
+    render() {
+        const {
+            currentPage,
+            cursorContext,
+            dynamicJumpOut,
+            extraKeys,
+            roundTopLeft,
+            roundTopRight,
+        } = this.props;
+
+        let dismissOrJumpOutKey;
+        if (dynamicJumpOut) {
+            switch (cursorContext) {
+                case CursorContexts.IN_PARENS:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_OUT_PARENTHESES;
+                    break;
+
+                case CursorContexts.IN_SUPER_SCRIPT:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_OUT_EXPONENT;
+                    break;
+
+                case CursorContexts.IN_SUB_SCRIPT:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_OUT_BASE;
+                    break;
+
+                case CursorContexts.BEFORE_FRACTION:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_INTO_NUMERATOR;
+                    break;
+
+                case CursorContexts.IN_NUMERATOR:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_OUT_NUMERATOR;
+                    break;
+
+                case CursorContexts.IN_DENOMINATOR:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_OUT_DENOMINATOR;
+                    break;
+
+                case CursorContexts.NONE:
+                default:
+                    dismissOrJumpOutKey = KeyConfigs.DISMISS;
+                    break;
+            }
+        } else {
+            dismissOrJumpOutKey = KeyConfigs.DISMISS;
+        }
+
+        const rightPageStyle = [
+            row,
+            fullWidth,
+            styles.rightPage,
+            roundTopRight && roundedTopRight,
+        ];
+        const rightPage = (
+            <View style={rightPageStyle}>
+                <View style={[column, oneColumn]}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_7}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_4}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_1}
+                        borders={BorderStyles.BOTTOM}
+                    />
+                    <ManyKeypadButton
+                        keys={extraKeys}
+                        borders={BorderStyles.NONE}
+                    />
+                </View>
+                <View style={[column, oneColumn]}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_8}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_5}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_2}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_0}
+                        borders={BorderStyles.LEFT}
+                    />
+                </View>
+                <View style={[column, oneColumn]}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_9}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_6}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_3}
+                        borders={BorderStyles.BOTTOM}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.DECIMAL}
+                        borders={BorderStyles.LEFT}
+                    />
+                </View>
+                <View style={[column, oneColumn]}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.DIVIDE}
+                        borders={BorderStyles.LEFT}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.TIMES}
+                        borders={BorderStyles.LEFT}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.MINUS}
+                        borders={BorderStyles.LEFT}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.PLUS}
+                        borders={BorderStyles.LEFT}
+                    />
+                </View>
+                <View style={[column, oneColumn]}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.FRAC}
+                        style={roundTopRight && roundedTopRight}
+                    />
+                    <TouchableKeypadButton keyConfig={KeyConfigs.CDOT} />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.BACKSPACE}
+                        borders={BorderStyles.LEFT}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={dismissOrJumpOutKey}
+                        borders={BorderStyles.LEFT}
+                    />
+                </View>
+            </View>
+        );
+
+        const leftPageStyle = [
+            row,
+            fullWidth,
+            styles.leftPage,
+            roundTopLeft && roundedTopLeft,
+        ];
+        const leftPage = (
+            <View style={leftPageStyle}>
+                <View style={[column, oneColumn]}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.EXP_2}
+                        borders={BorderStyles.NONE}
+                        style={roundTopLeft && roundedTopLeft}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.SQRT}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.LOG}
+                        borders={BorderStyles.BOTTOM}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.SIN}
+                        borders={BorderStyles.NONE}
+                    />
+                </View>
+                <View style={[column, oneColumn]}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.EXP_3}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.CUBE_ROOT}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.LN}
+                        borders={BorderStyles.BOTTOM}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.COS}
+                        borders={BorderStyles.NONE}
+                    />
+                </View>
+                <View style={[column, oneColumn]}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.EXP}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.RADICAL}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.LOG_N}
+                        borders={BorderStyles.BOTTOM}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.TAN}
+                        borders={BorderStyles.NONE}
+                    />
+                </View>
+                <View style={[column, oneColumn]}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.GEQ}
+                        borders={BorderStyles.LEFT}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.EQUAL}
+                        borders={BorderStyles.LEFT}
+                    />
+                    <TouchableKeypadButton keyConfig={KeyConfigs.LEQ} />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.LEFT_PAREN}
+                        borders={BorderStyles.LEFT}
+                    />
+                </View>
+                <View style={[column, oneColumn]}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.GT}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NEQ}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.LT}
+                        borders={BorderStyles.BOTTOM}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.RIGHT_PAREN}
+                        borders={BorderStyles.NONE}
+                    />
+                </View>
+            </View>
+        );
+
+        return (
+            <TwoPageKeypad
+                currentPage={currentPage}
+                rightPage={rightPage}
+                leftPage={leftPage}
+            />
+        );
+    }
+}
+
+const styles = StyleSheet.create({
+    // NOTE(charlie): These backgrounds are applied to as to fill in some
+    // unfortunate 'cracks' in the layout. However, not all keys in the first
+    // page use this background color (namely, the 'command' keys, backspace and
+    // dismiss).
+    // TODO(charlie): Apply the proper background between the 'command' keys.
+    rightPage: {
+        backgroundColor: valueGrey,
+    },
+
+    leftPage: {
+        backgroundColor: controlGrey,
+    },
+});
+
+const mapStateToProps = (state) => {
+    return {
+        currentPage: state.pager.currentPage,
+        cursorContext: state.input.cursor.context,
+        dynamicJumpOut: !state.layout.navigationPadEnabled,
+    };
+};
+
+export default connect(mapStateToProps, null, null, {forwardRef: true})(
+    ExpressionKeypad,
+);

package/src/components/fraction-keypad.js

@@ -0,0 +1,176 @@
+/**
+ * A keypad that includes the digits, as well as the symbols required to deal
+ * with fractions, decimals, and percents.
+ */
+
+import PropTypes from "prop-types";
+import * as React from "react";
+import {connect} from "react-redux";
+
+import {BorderStyles} from "../consts.js";
+import KeyConfigs from "../data/key-configs.js";
+import {View} from "../fake-react-native-web/index.js";
+
+import * as CursorContexts from "./input/cursor-contexts.js";
+import Keypad from "./keypad.js";
+import {cursorContextPropType} from "./prop-types.js";
+import Styles from "./styles.js";
+import TouchableKeypadButton from "./touchable-keypad-button.js";
+
+const {row, roundedTopLeft, roundedTopRight} = Styles;
+
+class FractionKeypad extends React.Component {
+    static propTypes = {
+        cursorContext: cursorContextPropType.isRequired,
+        dynamicJumpOut: PropTypes.bool,
+        roundTopLeft: PropTypes.bool,
+        roundTopRight: PropTypes.bool,
+    };
+
+    static rows = 4;
+    static columns = 4;
+
+    // Since we include a two-key popover in the top-right, when the popover
+    // is visible, the keypad will expand to fill the equivalent of five
+    // rows vertically.
+    static maxVisibleRows = 5;
+
+    static numPages = 1;
+
+    render() {
+        const {cursorContext, dynamicJumpOut, roundTopLeft, roundTopRight} =
+            this.props;
+
+        let dismissOrJumpOutKey;
+        if (dynamicJumpOut) {
+            switch (cursorContext) {
+                case CursorContexts.IN_PARENS:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_OUT_PARENTHESES;
+                    break;
+
+                case CursorContexts.IN_SUPER_SCRIPT:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_OUT_EXPONENT;
+                    break;
+
+                case CursorContexts.IN_SUB_SCRIPT:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_OUT_BASE;
+                    break;
+
+                case CursorContexts.BEFORE_FRACTION:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_INTO_NUMERATOR;
+                    break;
+
+                case CursorContexts.IN_NUMERATOR:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_OUT_NUMERATOR;
+                    break;
+
+                case CursorContexts.IN_DENOMINATOR:
+                    dismissOrJumpOutKey = KeyConfigs.JUMP_OUT_DENOMINATOR;
+                    break;
+
+                case CursorContexts.NONE:
+                default:
+                    dismissOrJumpOutKey = KeyConfigs.DISMISS;
+                    break;
+            }
+        } else {
+            dismissOrJumpOutKey = KeyConfigs.DISMISS;
+        }
+
+        return (
+            <Keypad>
+                <View style={row}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_7}
+                        borders={BorderStyles.NONE}
+                        style={roundTopLeft && roundedTopLeft}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_8}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_9}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.FRAC}
+                        disabled={
+                            // NOTE(charlie): It's only sufficient to use
+                            // `IN_NUMERATOR` and `IN_DENOMINATOR` here because we
+                            // don't support parentheses in this keypad. If we did,
+                            // then when the cursor was inside a parenthetical
+                            // expression in a numerator or denominator, this check
+                            // would fail.
+                            cursorContext === CursorContexts.IN_NUMERATOR ||
+                            cursorContext === CursorContexts.IN_DENOMINATOR
+                        }
+                        style={roundTopRight && roundedTopRight}
+                    />
+                </View>
+                <View style={row}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_4}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_5}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_6}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton keyConfig={KeyConfigs.PERCENT} />
+                </View>
+                <View style={row}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_1}
+                        borders={BorderStyles.BOTTOM}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_2}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_3}
+                        borders={BorderStyles.BOTTOM}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.BACKSPACE}
+                        borders={BorderStyles.LEFT}
+                    />
+                </View>
+                <View style={row}>
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NEGATIVE}
+                        borders={BorderStyles.NONE}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.NUM_0}
+                        borders={BorderStyles.LEFT}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={KeyConfigs.DECIMAL}
+                        borders={BorderStyles.LEFT}
+                    />
+                    <TouchableKeypadButton
+                        keyConfig={dismissOrJumpOutKey}
+                        borders={BorderStyles.LEFT}
+                    />
+                </View>
+            </Keypad>
+        );
+    }
+}
+
+const mapStateToProps = (state) => {
+    return {
+        cursorContext: state.input.cursor.context,
+        dynamicJumpOut: !state.layout.navigationPadEnabled,
+    };
+};
+
+export default connect(mapStateToProps, null, null, {forwardRef: true})(
+    FractionKeypad,
+);