update keypad to include scientific button only on first tab

Khan · Dec 27, 2024 · c733c2f · c733c2f
1 parent e33414a
commit c733c2f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/packages/math-input/src/components/keypad/keypad-pages/numbers-page.tsx b/packages/math-input/src/components/keypad/keypad-pages/numbers-page.tsx
@@ -8,10 +8,10 @@ import type {ClickKeyCallback} from "../../../types";
 
 type Props = {
     onClickKey: ClickKeyCallback;
+    scientific?: boolean;
 };
 
-export default function NumbersPage(props: Props) {
-    const {onClickKey} = props;
+export default function NumbersPage({onClickKey, scientific}: Props) {
     const {strings} = useMathInputI18n();
     const Keys = KeyConfigs(strings);
     // These keys are arranged sequentially so that tabbing follows numerical order. This
@@ -92,6 +92,14 @@ export default function NumbersPage(props: Props) {
                 coord={[3, 0]}
                 secondary
             />
+            {scientific && (
+                <KeypadButton
+                    keyConfig={Keys.EXP}
+                    onClickKey={onClickKey}
+                    coord={[3, 2]}
+                    secondary
+                />
+            )}
         </>
     );
 }
diff --git a/packages/math-input/src/components/keypad/keypad.tsx b/packages/math-input/src/components/keypad/keypad.tsx
@@ -157,7 +157,10 @@ export default function Keypad({extraKeys = [], ...props}: Props) {
                             />
                         )}
                         {selectedPage === "Numbers" && (
-                            <NumbersPage onClickKey={onClickKey} />
+                            <NumbersPage
+                                onClickKey={onClickKey}
+                                scientific={scientific}
+                            />
                         )}
                         {selectedPage === "Extras" && (
                             <ExtrasPage
@@ -184,7 +187,6 @@ export default function Keypad({extraKeys = [], ...props}: Props) {
                                 convertDotToTimes={convertDotToTimes}
                                 divisionKey={divisionKey}
                                 selectedPage={selectedPage}
-                                scientific={scientific}
                             />
                         )}
                     </View>

diff --git a/packages/math-input/src/components/keypad/shared-keys.tsx b/packages/math-input/src/components/keypad/shared-keys.tsx
@@ -16,7 +16,6 @@ type Props = {
     cursorContext?: (typeof CursorContext)[keyof typeof CursorContext];
     convertDotToTimes?: boolean;
     divisionKey?: boolean;
-    scientific?: boolean;
 };
 
 export default function SharedKeys(props: Props) {
@@ -26,7 +25,6 @@ export default function SharedKeys(props: Props) {
         divisionKey,
         convertDotToTimes,
         selectedPage,
-        scientific,
     } = props;
     const {strings, locale} = useMathInputI18n();
     const cursorKeyConfig = getCursorContextConfig(strings, cursorContext);
@@ -58,14 +56,6 @@ export default function SharedKeys(props: Props) {
                 coord={[5, 0]}
                 secondary
             />
-            {scientific && (
-                <KeypadButton
-                    keyConfig={Keys.EXP}
-                    onClickKey={onClickKey}
-                    coord={[3, 2]}
-                    secondary
-                />
-            )}
             {/* Row 2 */}
             <KeypadButton
                 keyConfig={

diff --git a/packages/perseus/src/components/__stories__/math-input.stories.tsx b/packages/perseus/src/components/__stories__/math-input.stories.tsx
@@ -15,6 +15,7 @@ const meta: Meta = {
             logarithms: true,
             preAlgebra: true,
             trigonometry: true,
+            scientific: true,
         },
         convertDotToTimes: false,
         value: "",