Compare commits

...

45 Commits

Author SHA1 Message Date
matmoul 9abdc33713 fix(calc-02): update stack labels for navigation and move modes 2026-05-17 05:34:06 +02:00
matmoul 6dd9550890 feat: add stack navigation and reordering controls 2026-05-17 04:24:43 +02:00
matmoul f44fb8c252 docs: align calculator visual portrait table cell 2026-05-17 03:23:47 +02:00
matmoul 5cc97f754d fix(calc-02): restore edited value on cancel
Canceling stack-top editing now pushes the original value back before
leaving edit mode, including Escape and ArrowDown handling.
2026-05-17 01:31:43 +02:00
matmoul 736154110d fix: correct calc-02 function key shortcuts 2026-05-17 00:38:32 +02:00
matmoul 62a0f447c5 feat: update calculator function key labels and shortcuts
Add titles for function and trig buttons to expose keyboard hints, and remap reciprocal/power10 shortcuts to match the new key layout.
Update the portrait visual spec to reflect the revised keypad and function ordering.
2026-05-17 00:35:50 +02:00
matmoul 16b567731f docs: update calc-02 shortcut reference and key mappings 2026-05-17 00:14:24 +02:00
matmoul b710d5f0eb refactor(calc-02): simplify stack display and edit cursor handling 2026-05-16 23:43:49 +02:00
matmoul 07a4c533fb fix: preserve full calc-02 stack while limiting display to top 4
Keep the calculator stack unlimited in the demo and only constrain the rendered stack view. Also restore the edit cursor position when pulling a value into the input from the stack.
2026-05-16 23:40:13 +02:00
matmoul acc075d30c feat(calc-02): add cursor-aware editing in the X stack display 2026-05-16 23:30:50 +02:00
matmoul 6a37c7c1e8 feat: add pow10 and exp arithmetic operations 2026-05-16 23:15:22 +02:00
matmoul 5f2d18df99 fix(calc-02): constrain keypad area with internal scrolling
Wrap the keypad, function, and trig panels in a dedicated scroll area so the calculator shell can use a fixed grid layout without overflowing the viewport. Also update panel styling to preserve spacing and scrollbar behavior.
2026-05-16 22:40:23 +02:00
matmoul c69380d057 refactor(samples): reorder calculator keypad keys 2026-05-16 21:58:51 +02:00
matmoul c11a75d7f7 fix: bust calc sample stylesheet cache 2026-05-16 21:52:05 +02:00
matmoul 813fae1b61 refactor(calc-02): simplify calculator layout structure
Move the display and button panels into a single wrapper and rely on
viewport-height sizing with hidden page overflow to keep the calculator
contained. Also trim redundant panel-specific layout rules and styling.
2026-05-16 21:41:47 +02:00
matmoul 208db58fe7 fix: make calc-02 panels stretch and scroll within container 2026-05-16 20:24:43 +02:00
matmoul ea6401a006 fix: constrain calculator width on calc-02 sample 2026-05-16 20:17:19 +02:00
matmoul ea61ec17d5 fix: remove portrait class from calc-02 calculator shell 2026-05-16 19:44:09 +02:00
matmoul a4bbffe65b feat: replace calculator enter key label with symbol 2026-05-16 18:41:03 +02:00
matmoul a24142cd72 docs: remove obsolete temporary README file 2026-05-16 05:23:42 +02:00
matmoul 4df99d0738 docs: update README for default demo and command aliases 2026-05-16 05:01:17 +02:00
matmoul 1cef2d2d6a fix(calc-02): reorder display buttons in portrait layout 2026-05-16 04:44:18 +02:00
matmoul 442a97d573 fix: reorder calc display buttons in portrait layout 2026-05-16 04:34:20 +02:00
matmoul 44ce67c5cc docs: align calc-02 visual portrait tables 2026-05-16 04:20:22 +02:00
matmoul a7411243de fix: reorder display buttons in calc-02 sample 2026-05-16 04:14:28 +02:00
matmoul f8de4e1709 docs: update project memory for calc-02 UI and command notes 2026-05-16 04:10:19 +02:00
matmoul 003d4fde1b feat(calc-02): add shared popup menus for mode and constants
Refactor the calc-02 demo to use a single popup menu component for angle mode and constants, align the menus to their trigger buttons, and update the README/project notes to reflect the portrait-first demo layout and constant API.
2026-05-16 04:04:01 +02:00
matmoul e5f50aee0a fix: reorder calc-02 display buttons 2026-05-16 03:44:20 +02:00
matmoul 6a7a60a9bc fix: align calc menus with trigger width 2026-05-16 03:41:25 +02:00
matmoul a37ed59b40 fix: reorder calc-02 display buttons 2026-05-16 03:37:04 +02:00
matmoul c09fdc7e0f refactor(calc-02): simplify display and button styling
Remove layered shadows and pressed-state transforms from the calculator UI, and update the stack copy icon markup and active feedback to match the new flat design.
2026-05-16 03:21:49 +02:00
matmoul 849170ea49 docs: update calc-02 portrait visual reference
Move the portrait layout documentation to samples/calc-02/visual-portrait.md and refresh the project memory note to point to the new reference.
2026-05-16 03:11:00 +02:00
matmoul 0100da80bb fix(calc-02): adjust keypad grid sizing 2026-05-16 03:02:43 +02:00
matmoul e1fd730db5 fix: remove panel border from calc sample 2026-05-16 02:48:59 +02:00
matmoul ba53f51bf7 refactor(samples): simplify calc-02 background styling 2026-05-16 02:48:00 +02:00
matmoul 534bbc0afb feat: add dynamic constant management to the calculator core 2026-05-16 02:23:20 +02:00
matmoul 2504716c64 fix: tighten calc stack display layout
Reorder the stack cell grid so the copy button sits beside the label and reduce spacing to better align the value column.
2026-05-16 02:04:47 +02:00
matmoul 6c8c032f7a fix: stabilize calculator display sizing 2026-05-16 02:02:45 +02:00
matmoul d8d0556822 style: tighten calculator sample layout spacing 2026-05-16 01:48:52 +02:00
matmoul 426fd326a5 fix(calc-02): simplify button spacing and menu background 2026-05-16 01:43:00 +02:00
matmoul 5364208491 feat(calc-02): refine display button layout and icon styling 2026-05-16 01:38:53 +02:00
matmoul 1e703bebe8 fix(calc-02): adjust display button layout and enter key spacing 2026-05-16 01:28:30 +02:00
matmoul 54797f9dd9 refactor(samples/calc-02): simplify layout to portrait-only single column
Remove the responsive two-column desktop arrangement and make the calculator stack vertically with a 4-column display button row that preserves alignment. Also align the display buttons with the shared base button styling.
2026-05-16 01:16:47 +02:00
matmoul 75bf6d69df fix(calc-02): align display buttons in a grid
Wrap the display controls in a dedicated grid container, add a spacer for the missing cell, and simplify the button styling so the layout stays consistent across sizes.
2026-05-16 01:08:11 +02:00
matmoul 256e9f2b33 refactor(calc-02): move display buttons into their own grid area 2026-05-16 01:01:14 +02:00
9 changed files with 778 additions and 439 deletions
+9 -8
View File
@@ -1,8 +1,9 @@
# Project memory # State
- Core engine: `src/rpn-calculator.js`
- RPN calculator JS project. - Reference demo: `samples/calc-02/` (portrait-first HP48GX layout; calc-02 keyboard shortcuts are the reference; compact mode/constants popups; Const button comes before Mode in the display row)
- Read `.memory/state.md` for current state. - Important UI behavior: mode button shows the current angle mode; keyboard focus stays on the hidden input on desktop; clipboard paste is supported
- Keep names and commands in English. - Note: keep scrolling behavior in mind for the calc-02 demo when changing the stack/UI layout
- Update memory files based on events: engine, demo, API, commands, exports, docs, or tasks. - Public API: `push`, `pop`, `clear`, `swap`, `remove`, `edit`, `isValidIndex`, `input`, `command`, `getOperationsByCategory`, `getConstants`, `listConstants`, `setConstant`, `removeConstant`, `hasConstant`
- Core arithmetic now includes `root` for y-th roots, and `samples/calc-02/` uses it for `y√x`. - Config: `maxSize`, `base`, `angleMode`, `enabledCommands`
- `samples/calc-02/` in portrait mode remains the active responsive demo. - Commands: arithmetic, stack, trigonometry, constants `pi` and `e`; arithmetic includes `root`; constants can be added or removed dynamically through the core API
- Exports: browser `window.RpnCalculator`, CommonJS `module.exports`
+4 -5
View File
@@ -1,9 +1,8 @@
# State # State
- Core engine: `src/rpn-calculator.js` - Core engine: `src/rpn-calculator.js`
- Active demo: `samples/calc-02/` responsive HP48GX layout with portrait/landscape support; display-adjacent button row stays in 4 columns - Default demo: `samples/dev/` classic browser demo; `samples/calc-02/` remains the portrait-first HP48GX-inspired reference
- Mode button shows the current angle mode only; selecting a mode uses a popup menu - Public API: `push`, `pop`, `clear`, `swap`, `remove`, `edit`, `isValidIndex`, `input`, `command`, `getOperationsByCategory`, `getConstants`, `listConstants`, `setConstant`, `removeConstant`, `hasConstant`
- Public API: `push`, `pop`, `clear`, `swap`, `remove`, `edit`, `isValidIndex`, `input`, `command`, `getOperationsByCategory`, `getConstants`
- Config: `maxSize`, `base`, `angleMode`, `enabledCommands` - Config: `maxSize`, `base`, `angleMode`, `enabledCommands`
- Commands: arithmetic, stack, trigonometry, constants `pi` and `e`; arithmetic now includes `root` for y-th roots - Commands: arithmetic, stack, trigonometry, constants `pi`, `e`, `phi`, `g`, and `c`; arithmetic includes `root` with `y√x`, `yroot`, and `nroot` aliases; constants can be added or removed dynamically through the core API
- Demo actions: keyboard focus is kept on the hidden input on desktop so typing keeps working; the keypad layout places Enter in the bottom-left, ± in the former Enter position, and Esc before Clear for safety; paste parses clipboard text as a number before pushing it to the stack; Ctrl+V is supported via the hidden input paste event; backspace is ignored when the stack is empty; operation errors are shown as an overlay bar on top of the calculator with a shorter timeout and darker red - Demo behavior: `samples/dev/` keeps hidden input focus on desktop and supports clipboard paste; `samples/calc-02/` uses compact mode/constants popups, a 4-column display-adjacent row, stack selection/move mode, and paste through the hidden input
- Exports: browser `window.RpnCalculator`, CommonJS `module.exports` - Exports: browser `window.RpnCalculator`, CommonJS `module.exports`
+28 -19
View File
@@ -1,30 +1,28 @@
# RPN Virtual Calculator # RPN Virtual Calculator
A browser-friendly RPN calculator built around a small, generic JavaScript API. A browser-friendly RPN calculator built around a small JavaScript API.
## Overview ## Overview
This project provides: This project provides:
- a reusable JavaScript RPN engine in `src/rpn-calculator.js` - a reusable JavaScript RPN engine in `src/rpn-calculator.js`
- browser demos in `samples/dev/` and `samples/calc-02/` - a classic browser demo in `samples/dev/`
- a command system centralized in a single operation dictionary - a portrait-first HP48GX-inspired demo in `samples/calc-02/`
- a small public API focused on stack operations and generic command dispatch - a centralized command system with aliases
- a compact public API focused on stack operations, editing, and command dispatch
The main class is `RpnCalculator`. The main class is `RpnCalculator`.
## Project structure ## Project structure
- `src/rpn-calculator.js`: calculator engine - `src/rpn-calculator.js`: calculator engine
- `samples/dev/index.html`: active browser demo entry point - `samples/dev/index.html`: browser demo entry point
- `samples/dev/index.css`: demo styles - `samples/dev/index.css`: demo styles
- `samples/dev/index.js`: demo UI and keyboard logic - `samples/dev/index.js`: demo UI and keyboard logic
- `samples/calc-01/index.html`: active browser demo entry point - `samples/calc-02/index.html`: portrait-first HP48GX-style demo entry point
- `samples/calc-01/index.css`: demo styles - `samples/calc-02/index.css`: portrait-first demo styles
- `samples/calc-01/index.js`: demo UI and keyboard logic - `samples/calc-02/index.js`: portrait-first HP48GX-style demo UI and keyboard logic
- `samples/calc-02/index.html`: new responsive HP48GX-style demo entry point
- `samples/calc-02/index.css`: new responsive demo styles
- `samples/calc-02/index.js`: responsive HP48GX-style demo UI and keyboard logic
- `samples/calc-XX/`: placeholder name for future demo variants - `samples/calc-XX/`: placeholder name for future demo variants
## Public API ## Public API
@@ -45,6 +43,10 @@ Instance helpers also available:
- `getOperationsByCategory()` - `getOperationsByCategory()`
- `getConstants()` - `getConstants()`
- `listConstants()`
- `setConstant(name, value)`
- `removeConstant(name)`
- `hasConstant(name)`
Static helpers also available: Static helpers also available:
@@ -84,6 +86,10 @@ Available constants:
- `pi` - `pi`
- `e` - `e`
- `phi`
- `g`
- `c`
- plus any user-defined constants added through the engine API
They can be used through `command(...)`: They can be used through `command(...)`:
@@ -234,7 +240,7 @@ console.log(calc.pop()); // 0.5
## Demo ## Demo
The active demo lives in `samples/dev/`. The default demo lives in `samples/dev/`.
Main UI features: Main UI features:
@@ -244,7 +250,12 @@ Main UI features:
- angle mode selector for `deg`, `rad`, and `grad` - angle mode selector for `deg`, `rad`, and `grad`
- status pills for `inputValue` and `isEditing` - status pills for `inputValue` and `isEditing`
- grouped panels for `Stack`, `Arithmetic`, `Trigonometry`, and `Constants` - grouped panels for `Stack`, `Arithmetic`, `Trigonometry`, and `Constants`
- error display area - keyboard-friendly hidden input on desktop
## Calc 02 demo
`samples/calc-02/` is a portrait-first HP48GX-inspired demo.
It keeps the display-adjacent button row aligned in four columns, uses compact popup menus for mode and constants, and supports clipboard paste plus the `y√x` root operation.
The demo loads the engine from: The demo loads the engine from:
@@ -264,16 +275,14 @@ The current demo supports:
- `Escape` - `Escape`
- `ArrowUp`, `ArrowDown`, `ArrowRight` - `ArrowUp`, `ArrowDown`, `ArrowRight`
- `+`, `-`, `*`, `/`, `%`, `^` - `+`, `-`, `*`, `/`, `%`, `^`
- `q`, `n`, `r`, `i`, `g`, `l`, `s`, `c`, `S`, `C` - `s`, `S`, `r`, `R`, `v`, `u`
- `x`, `y`, `z`, `t` - `l`, `L`, `n`, `N`, `e`, `E`
- `i`, `o`, `a`, `I`, `O`, `A`
The demo also implements stack selection and stack-item move mode in its UI layer using the public calculator methods. The demo also implements stack selection and stack-item move mode in its UI layer using the public calculator methods.
It keeps the calculator screen focused and updates the visible stack window as the selection moves. It keeps the calculator screen focused and updates the visible stack window as the selection moves.
## Calc 02 demo Note: `calc-02` keyboard shortcuts are the reference for this project.
`samples/calc-02/` is a responsive HP48GX-inspired demo.
It adapts its layout to the browser window, supports portrait and landscape arrangements, and includes the `y√x` root operation.
## Exports ## Exports
+186 -205
View File
@@ -1,3 +1,4 @@
:root { :root {
--bg0: #10151e; --bg0: #10151e;
--bg1: #1b2432; --bg1: #1b2432;
@@ -31,43 +32,39 @@
html, body { html, body {
margin: 0; margin: 0;
min-height: 100%; min-height: 100%;
overflow-y: hidden;
} }
body { body {
min-height: 100vh; min-height: 100vh;
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
color: var(--buttonText); color: var(--buttonText);
background: background: var(--bg0);
radial-gradient(circle at top, rgba(255, 255, 255, 0.08), transparent 32%),
linear-gradient(180deg, var(--bg1), var(--bg0));
} }
.app-shell { .app-shell {
min-height: 100vh; min-height: 100vh;
display: grid; display: grid;
place-items: center; align-items: start;
justify-items: center;
padding: 0; padding: 0;
} }
.calculator { .calculator {
width: 100%; width: 100%;
height: 100%; max-width: 460px;
display: grid; height: 100vh;
max-height: 100vh;
padding: 8px; padding: 8px;
display: grid;
grid-template-rows: auto auto minmax(0, 1fr);
gap: 8px;
border-radius: 8px; border-radius: 8px;
background: linear-gradient(180deg, var(--panel2), var(--panel)); background: var(--panel);
border: 1px solid var(--edge); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08);
box-shadow: 0 26px 70px var(--shadow), inset 0 1px 0 rgba(255, 255, 255, 0.08); justify-content: stretch;
grid-template-columns: 1.3fr 0.9fr;
grid-template-rows: minmax(0, 0.62fr) min-content minmax(180px, 1fr) minmax(180px, 1fr);
align-content: start; align-content: start;
grid-template-areas: overflow: hidden;
"display functions"
"display functions"
"keypad functions"
"keypad trigo";
row-gap: 0;
column-gap: clamp(10px, 1.4vw, 18px);
} }
.display-block, .display-block,
@@ -75,16 +72,14 @@ body {
.display-buttons-panel, .display-buttons-panel,
.keypad-panel, .keypad-panel,
.functions-panel, .functions-panel,
.trigo-panel, .trigo-panel {
.status-line {
border-radius: 8px; border-radius: 8px;
border: 1px solid rgba(255, 255, 255, 0.06); border: 1px solid rgba(255, 255, 255, 0.06);
background: rgba(6, 10, 16, 0.16); background: rgba(6, 10, 16, 0.16);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05); box-shadow: none;
} }
.display-block { .display-block {
grid-area: display;
display: grid; display: grid;
gap: 0; gap: 0;
align-self: start; align-self: start;
@@ -98,48 +93,37 @@ body {
width: 100%; width: 100%;
padding: 16px; padding: 16px;
padding-bottom: 8px; padding-bottom: 8px;
background: linear-gradient(180deg, var(--display), var(--display2)); background: var(--display);
color: var(--displayText); color: var(--displayText);
font-family: "Courier New", monospace; font-family: "Courier New", monospace;
overflow: hidden; overflow: hidden;
height: auto; box-sizing: border-box;
min-height: clamp(112px, 18vw, 124px); height: 138px;
max-height: none; min-height: 138px;
max-height: 138px;
margin-bottom: 0; margin-bottom: 0;
} }
.display-frame {
margin: 0;
padding: 0;
}
.display-buttons-panel {
margin-top: 0;
}
.display-grid { .display-grid {
height: 100%; height: 100%;
display: grid; display: grid;
grid-template-columns: 1fr; grid-template-columns: 1fr;
grid-template-rows: repeat(4, minmax(0, 1fr)); grid-template-rows: repeat(4, minmax(0, auto));
align-content: start;
gap: 2px; gap: 2px;
} }
.stack-cell { .stack-cell {
display: grid; display: grid;
grid-template-columns: 2.2ch 1fr auto; grid-template-columns: 2.2ch auto minmax(0, 1fr);
align-items: center; align-items: center;
gap: 12px; gap: 8px;
font-size: clamp(18px, 3vw, 30px); font-size: 20px;
line-height: 1; line-height: 1;
min-height: 0; min-height: 0;
padding-block: 0; padding-block: 0;
} }
.stack-label { /* removed extra first-column styling */
text-align: right;
opacity: 0.78;
}
.stack-value { .stack-value {
min-height: 0; min-height: 0;
@@ -148,60 +132,98 @@ body {
text-overflow: ellipsis; text-overflow: ellipsis;
text-align: right; text-align: right;
justify-self: end; justify-self: end;
font-size: 20px;
} }
.stack-value.is-editing {
letter-spacing: 0.02em;
}
.stack-cell.is-selected {
background: transparent;
border-radius: 6px;
outline: 2px solid rgba(31, 42, 18, 0.2);
outline-offset: -2px;
}
.stack-cell.is-moving {
background: rgba(31, 42, 18, 0.18);
}
.display-buttons-panel { .display-buttons-panel {
width: 100%;
padding: 8px; padding: 8px;
min-height: 0;
background: rgba(6, 10, 16, 0.16);
}
.display-buttons-grid {
display: grid; display: grid;
grid-template-columns: repeat(4, minmax(0, 1fr)); grid-template-columns: repeat(4, minmax(0, 1fr));
grid-template-rows: repeat(2, auto);
gap: 8px; gap: 8px;
align-content: start; align-content: start;
align-items: stretch; align-items: stretch;
grid-auto-flow: row; }
grid-auto-rows: auto;
background: linear-gradient(180deg, #242a33, #1a1f27); .display-button-spacer {
border-color: rgba(255, 255, 255, 0.04); pointer-events: none;
margin-top: 0; visibility: hidden;
background: transparent;
border-color: transparent;
box-shadow: none;
} }
.display-button { .display-button {
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08), 0 3px 0 rgba(0, 0, 0, 0.34); background: linear-gradient(180deg, var(--btnTop), var(--btnBottom));
background-clip: padding-box; color: #eef2f7;
background: linear-gradient(180deg, #3a414c, #252b34); box-shadow: none;
color: #e8edf3;
border-color: rgba(255, 255, 255, 0.05);
} }
.display-button-offset { .display-button-symbol {
grid-column-start: 2; display: inline-flex;
align-items: center;
justify-content: center;
min-width: 1.2em;
font-size: 1.05em;
line-height: 1;
font-weight: 800;
transform: translateY(-0.01em);
} }
.display-buttons-panel > button { .paste-symbol {
width: 100%; font-size: 1em;
} }
.mode-menu { .display-buttons-grid > button {
padding: 6px 8px;
}
.menu-popup {
position: fixed; position: fixed;
z-index: 20; z-index: 20;
display: grid; display: flex;
gap: 6px; flex-direction: column;
padding: 10px; gap: 4px;
border-radius: 8px; padding: 6px;
background: rgba(18, 24, 33, 0.98); border-radius: 6px;
border: 1px solid rgba(255, 255, 255, 0.08); background: rgba(16, 21, 30, 0.96);
border: 1px solid rgba(255, 255, 255, 0.12);
box-shadow: 0 14px 30px rgba(0, 0, 0, 0.35); box-shadow: 0 10px 24px rgba(0, 0, 0, 0.32);
backdrop-filter: blur(2px);
} }
.mode-menu-item { .menu-popup-item {
min-width: 120px; width: 100%;
min-width: 0;
padding: 6px 10px;
border-radius: 5px;
background: linear-gradient(180deg, var(--btnAltTop), var(--btnAltBottom)); background: linear-gradient(180deg, var(--btnAltTop), var(--btnAltBottom));
text-align: left;
font-weight: 700;
} }
.mode-menu-item.is-active { .menu-popup-item.is-active {
outline: 2px solid rgba(207, 224, 174, 0.7); outline: 1px solid rgba(207, 224, 174, 0.7);
outline-offset: 0;
} }
.key-escape { .key-escape {
@@ -209,35 +231,24 @@ body {
color: #eef2f7; color: #eef2f7;
} }
.display-button:nth-child(6) { .keypad-panel,
background: linear-gradient(180deg, #343b46, #20262e); .functions-panel,
}
.display-button:nth-child(7) {
background: linear-gradient(180deg, #343b46, #20262e);
}
.keypad-panel {
grid-area: keypad;
padding: 10px;
}
.functions-panel {
grid-area: functions;
padding: 10px;
align-self: start;
min-height: 0;
padding-top: 10px;
padding-bottom: 8px;
}
.trigo-panel { .trigo-panel {
grid-area: trigo; padding: 8px;
padding: 10px;
align-self: start;
min-height: 0; min-height: 0;
padding-top: 10px; }
padding-bottom: 8px;
.calculator > .display-block,
.calculator > .display-buttons-panel,
.calculator > .keypad-scroll-area {
justify-self: stretch;
}
.keypad-scroll-area {
min-height: 0;
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: rgba(46, 105, 135, 1);
} }
.status-bar { .status-bar {
@@ -279,36 +290,30 @@ body {
.trigo-grid { .trigo-grid {
display: grid; display: grid;
gap: 8px; gap: 8px;
grid-auto-rows: minmax(0, 1fr);
} }
.keypad-grid { .keypad-grid {
grid-template-columns: repeat(4, minmax(0, 1fr)); grid-template-columns: repeat(4, minmax(0, 1fr));
grid-template-rows: repeat(5, minmax(0, 1fr)); grid-template-rows: repeat(5, minmax(0, 1.7fr));
} }
.functions-grid, .functions-grid,
.trigo-grid { .trigo-grid {
grid-template-columns: repeat(4, minmax(0, 1fr)); grid-template-columns: repeat(4, minmax(0, 1fr));
}
.functions-grid,
.trigo-grid {
grid-template-rows: repeat(2, minmax(0, 1fr)); grid-template-rows: repeat(2, minmax(0, 1fr));
} }
button { button {
border: 1px solid rgba(14, 18, 25, 0.85); border: 1px solid rgba(14, 18, 25, 0.85);
border-radius: 8px; border-radius: 8px;
padding: 10px 8px; padding: 8px 8px;
font: inherit; font: inherit;
font-weight: 700; font-weight: 700;
color: var(--btnText); color: var(--btnText);
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.35); text-shadow: 0 1px 0 rgba(0, 0, 0, 0.35);
cursor: pointer; cursor: pointer;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.18), 0 3px 0 rgba(0, 0, 0, 0.28); box-shadow: none;
transition: transform 120ms ease, filter 120ms ease, box-shadow 120ms ease, opacity 120ms ease; transition: filter 120ms ease, opacity 120ms ease;
line-height: 1; line-height: 1;
} }
@@ -316,22 +321,29 @@ button:hover {
filter: brightness(1.06); filter: brightness(1.06);
} }
.display-button:hover {
filter: brightness(1.08);
}
button:active { button:active {
transform: translateY(2px); transform: none;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08), 0 1px 0 rgba(0, 0, 0, 0.25); box-shadow: none;
} }
.display-button:active { .stack-copy-button:active {
transform: translateY(2px); animation: stack-copy-flash 140ms ease-out;
}
@keyframes stack-copy-flash {
0% {
opacity: 0.7;
}
50% {
opacity: 1;
}
100% {
opacity: 0.7;
}
} }
.stack-copy-button { .stack-copy-button {
padding: 4px; padding: 4px;
border-radius: 999px;
min-width: 24px; min-width: 24px;
width: 24px; width: 24px;
height: 24px; height: 24px;
@@ -339,11 +351,12 @@ button:active {
place-items: center; place-items: center;
opacity: 0; opacity: 0;
pointer-events: none; pointer-events: none;
transform: scale(0.9); transform: scale(1);
background: transparent; background: transparent;
border: none;
box-shadow: none; box-shadow: none;
color: rgba(31, 42, 18, 0.58); color: rgba(31, 42, 18, 0.58);
margin-left: 6px; margin-left: 0;
} }
.stack-cell:last-child { .stack-cell:last-child {
@@ -351,9 +364,9 @@ button:active {
} }
.stack-copy-button svg { .stack-copy-button svg {
width: 13px; width: 15px;
height: 13px; height: 15px;
fill: currentColor; fill: #0a0a0a;
display: block; display: block;
} }
@@ -370,7 +383,7 @@ button:active {
} }
.stack-copy-button:active { .stack-copy-button:active {
transform: translateY(2px) scale(1); transform: scale(1);
color: rgba(31, 42, 18, 0.95); color: rgba(31, 42, 18, 0.95);
} }
@@ -379,19 +392,61 @@ button:active {
outline-offset: 2px; outline-offset: 2px;
} }
.stack-value.is-editing {
display: inline-flex;
align-items: center;
justify-content: flex-end;
gap: 0;
}
.edit-text {
display: inline-block;
white-space: pre;
}
.edit-caret {
display: inline-block;
width: 1px;
height: 1em;
margin: 0 0.12ch;
background: currentColor;
animation: caret-blink 1s steps(1, end) infinite;
transform: translateY(0.02em);
}
@keyframes caret-blink {
0%, 49% {
opacity: 1;
}
50%, 100% {
opacity: 0.15;
}
}
.key-default { .key-default {
background: linear-gradient(180deg, var(--btnTop), var(--btnBottom)); background: linear-gradient(180deg, var(--btnTop), var(--btnBottom));
color: #eef2f7; color: #eef2f7;
} }
.key-accent { .keypad-grid > button {
background: linear-gradient(180deg, var(--btnAccentTop), var(--btnAccentBottom)); min-height: 1.7em;
color: #eef2f7;
} }
.key-alt { #keypadGrid > button {
background: linear-gradient(180deg, var(--btnAltTop), var(--btnAltBottom)); min-height: calc(1.7em * 1.7);
padding-top: calc(8px * 1.7);
padding-bottom: calc(8px * 1.7);
}
#keypadGrid > button.key-default,
#keypadGrid > button.key-accent,
#keypadGrid > button.key-danger,
#keypadGrid > button.key-enter {
min-height: calc(1.7em * 1.7);
}
.key-accent {
background: linear-gradient(180deg, var(--btnAccentTop), var(--btnAccentBottom));
color: #eef2f7; color: #eef2f7;
} }
@@ -403,6 +458,7 @@ button:active {
.key-enter { .key-enter {
background: linear-gradient(180deg, var(--btnEnterTop), var(--btnEnterBottom)); background: linear-gradient(180deg, var(--btnEnterTop), var(--btnEnterBottom));
color: #eef2f7; color: #eef2f7;
padding-inline: 6px;
} }
.hidden-input { .hidden-input {
@@ -414,79 +470,4 @@ button:active {
pointer-events: none; pointer-events: none;
} }
@media (orientation: portrait), (max-width: 860px) {
.calculator {
width: 100%;
height: auto;
min-height: 100%;
grid-template-columns: 1fr;
grid-template-rows: minmax(160px, auto) auto auto auto;
row-gap: 6px;
grid-template-areas:
"display"
"keypad"
"functions"
"trigo";
}
.display-buttons-panel {
grid-template-columns: repeat(4, minmax(0, 1fr));
grid-template-rows: repeat(2, auto);
margin-top: 0;
margin-bottom: 0;
padding-top: 4px;
padding-bottom: 4px;
align-content: start;
}
.keypad-grid {
grid-template-rows: repeat(5, minmax(42px, 1fr));
}
.functions-grid,
.trigo-grid {
grid-auto-rows: minmax(0, auto);
grid-template-rows: repeat(2, minmax(0, 1fr));
}
}
@media (max-width: 520px) {
.app-shell {
padding: 0;
}
.calculator {
width: 100%;
min-height: 100%;
border-radius: 8px;
padding: 8px;
gap: 12px;
}
.display-panel {
padding: 8px;
padding-bottom: 8px;
}
.stack-cell {
font-size: clamp(16px, 5.2vw, 22px);
gap: 8px;
}
.stack-copy-button {
padding: 4px;
min-width: 24px;
}
button {
border-radius: 8px;
padding: 10px 8px;
font-size: 13px;
line-height: 1;
}
.display-buttons-panel {
gap: 8px;
}
}
+17 -12
View File
@@ -4,35 +4,39 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>HP48GX RPN Calculator</title> <title>HP48GX RPN Calculator</title>
<link rel="stylesheet" href="./index.css"> <link rel="stylesheet" href="./index.css?ver=1">
</head> </head>
<body> <body>
<main class="app-shell"> <main class="app-shell">
<section class="calculator calculator-portrait" aria-label="HP48GX style RPN calculator"> <section class="calculator" aria-label="HP48GX style RPN calculator">
<div class="display-block"> <div class="display-block">
<div class="display-panel"> <div class="display-panel">
<div class="status-bar" id="statusLine" aria-live="polite"></div> <div class="status-bar" id="statusLine" aria-live="polite"></div>
<div class="display-frame"> <div class="display-frame">
<div class="display-grid"> <div class="display-grid">
<div class="stack-cell"><span class="stack-label">T:</span><span id="stackT" class="stack-value"></span><button type="button" class="stack-copy-button" data-copy-stack="T" aria-label="Copy T value"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path d="M9 9V5.5A1.5 1.5 0 0 1 10.5 4h8A1.5 1.5 0 0 1 20 5.5v8A1.5 1.5 0 0 1 18.5 15H15v3.5A1.5 1.5 0 0 1 13.5 20h-8A1.5 1.5 0 0 1 4 18.5v-8A1.5 1.5 0 0 1 5.5 9H9Zm1.5-3a.5.5 0 0 0-.5.5V9h5.5a1.5 1.5 0 0 1 1.5 1.5V16h.5a.5.5 0 0 0 .5-.5v-8a.5.5 0 0 0-.5-.5h-8Z"/></svg></button></div> <div class="stack-cell"><span class="stack-label">T:</span><button type="button" class="stack-copy-button" data-copy-stack="T" aria-label="Copy T value"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path d="M15.5 4h-7A2.5 2.5 0 0 0 6 6.5V8H5.5A1.5 1.5 0 0 0 4 9.5v8A2.5 2.5 0 0 0 6.5 20H13a1 1 0 0 0 1-1v-1.5H17.5A2.5 2.5 0 0 0 20 15V6.5A2.5 2.5 0 0 0 17.5 4h-2Zm.5 2h1.5a.5.5 0 0 1 .5.5V14a.5.5 0 0 1-.5.5H13V6.5A2.5 2.5 0 0 0 15.5 6Zm-1.5 12H6.5a.5.5 0 0 1-.5-.5v-8a.5.5 0 0 1 .5-.5h7.5V18Zm-1.5-8h-4V8.5A.5.5 0 0 1 9 8h4a.5.5 0 0 1 .5.5V10Z"/></svg></button><span id="stackT" class="stack-value"></span></div>
<div class="stack-cell"><span class="stack-label">Z:</span><span id="stackZ" class="stack-value"></span><button type="button" class="stack-copy-button" data-copy-stack="Z" aria-label="Copy Z value"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path d="M9 9V5.5A1.5 1.5 0 0 1 10.5 4h8A1.5 1.5 0 0 1 20 5.5v8A1.5 1.5 0 0 1 18.5 15H15v3.5A1.5 1.5 0 0 1 13.5 20h-8A1.5 1.5 0 0 1 4 18.5v-8A1.5 1.5 0 0 1 5.5 9H9Zm1.5-3a.5.5 0 0 0-.5.5V9h5.5a1.5 1.5 0 0 1 1.5 1.5V16h.5a.5.5 0 0 0 .5-.5v-8a.5.5 0 0 0-.5-.5h-8Z"/></svg></button></div> <div class="stack-cell"><span class="stack-label">Z:</span><button type="button" class="stack-copy-button" data-copy-stack="Z" aria-label="Copy Z value"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path d="M15.5 4h-7A2.5 2.5 0 0 0 6 6.5V8H5.5A1.5 1.5 0 0 0 4 9.5v8A2.5 2.5 0 0 0 6.5 20H13a1 1 0 0 0 1-1v-1.5H17.5A2.5 2.5 0 0 0 20 15V6.5A2.5 2.5 0 0 0 17.5 4h-2Zm.5 2h1.5a.5.5 0 0 1 .5.5V14a.5.5 0 0 1-.5.5H13V6.5A2.5 2.5 0 0 0 15.5 6Zm-1.5 12H6.5a.5.5 0 0 1-.5-.5v-8a.5.5 0 0 1 .5-.5h7.5V18Zm-1.5-8h-4V8.5A.5.5 0 0 1 9 8h4a.5.5 0 0 1 .5.5V10Z"/></svg></button><span id="stackZ" class="stack-value"></span></div>
<div class="stack-cell"><span class="stack-label">Y:</span><span id="stackY" class="stack-value"></span><button type="button" class="stack-copy-button" data-copy-stack="Y" aria-label="Copy Y value"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path d="M9 9V5.5A1.5 1.5 0 0 1 10.5 4h8A1.5 1.5 0 0 1 20 5.5v8A1.5 1.5 0 0 1 18.5 15H15v3.5A1.5 1.5 0 0 1 13.5 20h-8A1.5 1.5 0 0 1 4 18.5v-8A1.5 1.5 0 0 1 5.5 9H9Zm1.5-3a.5.5 0 0 0-.5.5V9h5.5a1.5 1.5 0 0 1 1.5 1.5V16h.5a.5.5 0 0 0 .5-.5v-8a.5.5 0 0 0-.5-.5h-8Z"/></svg></button></div> <div class="stack-cell"><span class="stack-label">Y:</span><button type="button" class="stack-copy-button" data-copy-stack="Y" aria-label="Copy Y value"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path d="M15.5 4h-7A2.5 2.5 0 0 0 6 6.5V8H5.5A1.5 1.5 0 0 0 4 9.5v8A2.5 2.5 0 0 0 6.5 20H13a1 1 0 0 0 1-1v-1.5H17.5A2.5 2.5 0 0 0 20 15V6.5A2.5 2.5 0 0 0 17.5 4h-2Zm.5 2h1.5a.5.5 0 0 1 .5.5V14a.5.5 0 0 1-.5.5H13V6.5A2.5 2.5 0 0 0 15.5 6Zm-1.5 12H6.5a.5.5 0 0 1-.5-.5v-8a.5.5 0 0 1 .5-.5h7.5V18Zm-1.5-8h-4V8.5A.5.5 0 0 1 9 8h4a.5.5 0 0 1 .5.5V10Z"/></svg></button><span id="stackY" class="stack-value"></span></div>
<div class="stack-cell"><span class="stack-label">X:</span><span id="stackX" class="stack-value"></span><button type="button" class="stack-copy-button" data-copy-stack="X" aria-label="Copy X value"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path d="M9 9V5.5A1.5 1.5 0 0 1 10.5 4h8A1.5 1.5 0 0 1 20 5.5v8A1.5 1.5 0 0 1 18.5 15H15v3.5A1.5 1.5 0 0 1 13.5 20h-8A1.5 1.5 0 0 1 4 18.5v-8A1.5 1.5 0 0 1 5.5 9H9Zm1.5-3a.5.5 0 0 0-.5.5V9h5.5a1.5 1.5 0 0 1 1.5 1.5V16h.5a.5.5 0 0 0 .5-.5v-8a.5.5 0 0 0-.5-.5h-8Z"/></svg></button></div> <div class="stack-cell"><span class="stack-label">X:</span><button type="button" class="stack-copy-button" data-copy-stack="X" aria-label="Copy X value"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path d="M15.5 4h-7A2.5 2.5 0 0 0 6 6.5V8H5.5A1.5 1.5 0 0 0 4 9.5v8A2.5 2.5 0 0 0 6.5 20H13a1 1 0 0 0 1-1v-1.5H17.5A2.5 2.5 0 0 0 20 15V6.5A2.5 2.5 0 0 0 17.5 4h-2Zm.5 2h1.5a.5.5 0 0 1 .5.5V14a.5.5 0 0 1-.5.5H13V6.5A2.5 2.5 0 0 0 15.5 6Zm-1.5 12H6.5a.5.5 0 0 1-.5-.5v-8a.5.5 0 0 1 .5-.5h7.5V18Zm-1.5-8h-4V8.5A.5.5 0 0 1 9 8h4a.5.5 0 0 1 .5.5V10Z"/></svg></button><span id="stackX" class="stack-value"></span></div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="display-buttons-panel"> <div class="display-buttons-panel">
<button id="modeButton" class="display-button">Mode</button> <div class="display-buttons-grid">
<button id="pasteButton" class="display-button"></button>
<button id="upButton" class="display-button"></button>
<button id="constButton" class="display-button">π</button> <button id="constButton" class="display-button">π</button>
<button id="leftButton" class="display-button display-button-offset"></button> <button id="pasteButton" class="display-button"><span class="display-button-symbol paste-symbol"></span></button>
<button id="downButton" class="display-button"></button> <button id="upButton" class="display-button"><span class="display-button-symbol arrow-symbol"></span></button>
<button id="rightButton" class="display-button"></button> <button id="modeButton" class="display-button">Mode</button>
<div class="display-button-spacer"></div>
<button id="leftButton" class="display-button display-button-offset"><span class="display-button-symbol arrow-symbol"></span></button>
<button id="downButton" class="display-button"><span class="display-button-symbol arrow-symbol"></span></button>
<button id="rightButton" class="display-button"><span class="display-button-symbol arrow-symbol"></span></button>
</div> </div>
</div> </div>
<div class="keypad-scroll-area">
<div class="keypad-panel"> <div class="keypad-panel">
<div class="keypad-grid" id="keypadGrid"></div> <div class="keypad-grid" id="keypadGrid"></div>
</div> </div>
@@ -44,6 +48,7 @@
<div class="trigo-panel"> <div class="trigo-panel">
<div class="trigo-grid" id="trigoGrid"></div> <div class="trigo-grid" id="trigoGrid"></div>
</div> </div>
</div>
<input id="hiddenInput" class="hidden-input" type="text" autocomplete="off" aria-hidden="true" tabindex="-1"> <input id="hiddenInput" class="hidden-input" type="text" autocomplete="off" aria-hidden="true" tabindex="-1">
</section> </section>
+394 -133
View File
@@ -30,10 +30,10 @@ const calculatorEl = document.querySelector('.calculator');
const statusLine = document.getElementById('statusLine'); const statusLine = document.getElementById('statusLine');
const keypadKeys = [ const keypadKeys = [
{ label: 'ENTER', action: 'enter', className: 'key-enter' },
{ label: '⎋', action: 'escape', className: 'key-escape' },
{ label: 'C', action: 'clear', className: 'key-danger' }, { label: 'C', action: 'clear', className: 'key-danger' },
{ label: '⌫', action: 'backspace', className: 'key-danger' }, { label: '⌫', action: 'backspace', className: 'key-danger' },
{ label: '⎋', action: 'escape', className: 'key-escape' },
{ label: '⏎', action: 'enter', className: 'key-enter' },
{ label: '7', input: '7', className: 'key-default' }, { label: '7', input: '7', className: 'key-default' },
{ label: '8', input: '8', className: 'key-default' }, { label: '8', input: '8', className: 'key-default' },
{ label: '9', input: '9', className: 'key-default' }, { label: '9', input: '9', className: 'key-default' },
@@ -53,32 +53,31 @@ const keypadKeys = [
]; ];
const functionKeys = [ const functionKeys = [
{ label: 'x²', action: 'sqr', className: 'key-default' }, { label: 'x²', action: 'sqr', className: 'key-default', title: 's' },
{ label: '', action: 'pow', className: 'key-default' }, { label: '√x', action: 'sqrt', className: 'key-default', title: 'r' },
{ label: '1/x', action: 'recip', className: 'key-default' }, { label: '1/x', action: 'recip', className: 'key-default', title: 'x' },
{ label: '%', action: 'mod', className: 'key-default' }, { label: '%', action: 'mod', className: 'key-default' },
{ label: '√x', action: 'sqrt', className: 'key-default' }, { label: '', action: 'pow', className: 'key-default', title: 'S' },
{ label: 'y√x', action: 'root', className: 'key-default' }, { label: 'y√x', action: 'root', className: 'key-default', title: 'R' },
{ label: '10ˣ', action: 'pow10', className: 'key-default' }, { label: '10ˣ', action: 'pow10', className: 'key-default', title: 'd' },
{ label: '', spacer: true }, { label: '', spacer: true },
{ label: 'log', action: 'log', className: 'key-default' }, { label: 'log', action: 'log', className: 'key-default', title: 'l / L' },
{ label: 'ln', action: 'ln', className: 'key-default' }, { label: 'ln', action: 'ln', className: 'key-default', title: 'n / N' },
{ label: 'eˣ', action: 'exp', className: 'key-default' }, { label: 'eˣ', action: 'exp', className: 'key-default', title: 'e / E' },
{ label: '', spacer: true }, { label: '', spacer: true },
]; ];
const trigoKeys = [ const trigoKeys = [
{ label: 'sin', action: 'sin', className: 'key-default' }, { label: 'sin', action: 'sin', className: 'key-default', title: 'i' },
{ label: 'cos', action: 'cos', className: 'key-default' }, { label: 'cos', action: 'cos', className: 'key-default', title: 'o' },
{ label: 'tan', action: 'tan', className: 'key-default' }, { label: 'tan', action: 'tan', className: 'key-default', title: 'a' },
{ label: '', spacer: true }, { label: '', spacer: true },
{ label: 'asin', action: 'asin', className: 'key-default' }, { label: 'asin', action: 'asin', className: 'key-default', title: 'I' },
{ label: 'acos', action: 'acos', className: 'key-default' }, { label: 'acos', action: 'acos', className: 'key-default', title: 'O' },
{ label: 'atan', action: 'atan', className: 'key-default' }, { label: 'atan', action: 'atan', className: 'key-default', title: 'A' },
{ label: '', spacer: true }, { label: '', spacer: true },
]; ];
const isTouchDevice = window.matchMedia('(pointer: coarse)').matches || 'ontouchstart' in window; const isTouchDevice = window.matchMedia('(pointer: coarse)').matches || 'ontouchstart' in window;
function focusInput() { function focusInput() {
@@ -95,6 +94,11 @@ function focusInput() {
} }
let statusTimer = null; let statusTimer = null;
let editCursor = 0;
let editRestoreValue = null;
let stackMode = 'normal';
let stackSelection = 0;
let stackMoveSnapshot = null;
function setStatus(message, isError = false, timeoutMs = 1400) { function setStatus(message, isError = false, timeoutMs = 1400) {
if (!statusLine) return; if (!statusLine) return;
@@ -119,27 +123,41 @@ function clearStatus() {
statusLine.classList.remove('is-error'); statusLine.classList.remove('is-error');
} }
function normalizeStack() {
while (calc.stack.length > 4) {
calc.stack.shift();
}
}
function getStackLine(indexFromTop) { function getStackLine(indexFromTop) {
return indexFromTop >= 0 && indexFromTop < calc.stack.length ? calc.stack[indexFromTop] : ''; return indexFromTop >= 0 && indexFromTop < calc.stack.length ? calc.stack[indexFromTop] : '';
} }
function getStackDisplayValue(label) { function getStackDisplayValue(label) {
if (label === 'X') { if (label === 'X' && calc.isEditing) {
return calc.isEditing ? calc.inputValue : (calc.formatNumber(getStackLine(0)) || ''); return calc.inputValue;
} }
if (label === 'Y') { const indexMap = { X: 0, Y: 1, Z: 2, T: 3 };
return calc.isEditing ? (calc.formatNumber(getStackLine(0)) || '') : (calc.formatNumber(getStackLine(1)) || ''); const indexFromTop = calc.isEditing ? Math.max(0, indexMap[label] - 1) : indexMap[label];
return calc.formatNumber(getStackLine(indexFromTop)) || '';
} }
if (label === 'Z') {
return calc.isEditing ? (calc.formatNumber(getStackLine(1)) || '') : (calc.formatNumber(getStackLine(2)) || ''); function getVisibleStackLabel(label) {
if (stackMode === 'navigation' || stackMode === 'move') {
const indexMap = { X: 0, Y: 1, Z: 2, T: 3 };
return String(indexMap[label]);
} }
return calc.isEditing ? (calc.formatNumber(getStackLine(2)) || '') : (calc.formatNumber(getStackLine(3)) || ''); return label;
}
function updateStackLabels() {
const stackLabels = ['T', 'Z', 'Y', 'X'];
for (const label of stackLabels) {
const stackCell = stackEls[label].parentElement;
if (!stackCell) continue;
const labelEl = stackCell.querySelector('.stack-label');
if (labelEl) {
labelEl.textContent = `${getVisibleStackLabel(label)}:`;
}
}
}
function stackModeToLabel(index) {
return ['X', 'Y', 'Z', 'T'][Math.max(0, Math.min(3, index))] ?? 'X';
} }
function updateCopyButtons() { function updateCopyButtons() {
@@ -153,40 +171,191 @@ function updateCopyButtons() {
} }
} }
function renderEditValue() {
const cursor = Math.max(0, Math.min(editCursor, calc.inputValue.length));
stackEls.X.innerHTML = `<span class="edit-text">${calc.inputValue.slice(0, cursor)}</span><span class="edit-caret" aria-hidden="true"></span><span class="edit-text">${calc.inputValue.slice(cursor)}</span>`;
}
function render() { function render() {
normalizeStack();
const isPortrait = window.matchMedia('(orientation: portrait)').matches || window.innerWidth <= 860; const isPortrait = window.matchMedia('(orientation: portrait)').matches || window.innerWidth <= 860;
calculatorEl?.classList.toggle('portrait', isPortrait); calculatorEl?.classList.toggle('portrait', isPortrait);
calculatorEl?.classList.toggle('landscape', !isPortrait); calculatorEl?.classList.toggle('landscape', !isPortrait);
stackEls.X.textContent = getStackDisplayValue('X'); const stackLabels = ['T', 'Z', 'Y', 'X'];
stackEls.Y.textContent = getStackDisplayValue('Y'); for (const label of stackLabels) {
stackEls.Z.textContent = getStackDisplayValue('Z'); const isSelected = stackMode !== 'normal' && stackModeToLabel(stackSelection) === label;
stackEls.T.textContent = getStackDisplayValue('T'); const value = label === 'X' && calc.isEditing ? '' : getStackDisplayValue(label);
stackEls[label].textContent = value;
stackEls[label].classList.toggle('is-editing', label === 'X' && calc.isEditing);
stackEls[label].classList.toggle('is-caret-visible', label === 'X' && calc.isEditing);
stackEls[label].parentElement?.classList.toggle('is-selected', isSelected);
stackEls[label].parentElement?.classList.toggle('is-moving', stackMode === 'move' && stackModeToLabel(stackSelection) === label);
}
if (calc.isEditing) {
renderEditValue();
}
updateStackLabels();
updateCopyButtons(); updateCopyButtons();
modeButton.textContent = calc.angleMode; modeButton.textContent = calc.angleMode;
} }
function stopEditing(clearValue = false) {
if (clearValue) {
calc.inputValue = '';
}
calc.isEditing = false;
editCursor = 0;
}
function cancelEditing() {
if (editRestoreValue !== null) {
calc.push(editRestoreValue);
}
editRestoreValue = null;
stopEditing(true);
}
function enterNavigationMode() {
if (calc.isEditing) return;
stackMode = 'navigation';
stackSelection = 0;
stackMoveSnapshot = null;
render();
}
function exitStackMode() {
stackMode = 'normal';
stackSelection = 0;
stackMoveSnapshot = null;
render();
}
function moveNavigationSelection(delta) {
const maxIndex = Math.max(0, calc.stack.length - 1);
stackSelection = Math.max(0, Math.min(maxIndex, stackSelection + delta));
render();
}
function beginStackMove() {
stackMode = 'move';
stackMoveSnapshot = calc.stack.slice();
render();
}
function restoreStackMoveSnapshot() {
if (!stackMoveSnapshot) return;
calc.stack = stackMoveSnapshot.slice();
stackMoveSnapshot = null;
render();
}
function validateStackMove() {
stackMoveSnapshot = null;
stackMode = 'normal';
render();
}
function moveSelectedStackValue(delta) {
const index = stackSelection;
const target = Math.max(0, Math.min(calc.stack.length - 1, index + delta));
if (target === index) return;
const value = calc.stack.splice(index, 1)[0];
calc.stack.splice(target, 0, value);
stackSelection = target;
render();
}
function enterNavigationMode() {
if (calc.isEditing) return;
stackMode = 'navigation';
stackSelection = 0;
render();
}
function exitStackMode() {
stackMode = 'normal';
stackSelection = 0;
stackMoveSnapshot = null;
render();
}
function moveNavigationSelection(delta) {
const maxIndex = Math.max(0, calc.stack.length - 1);
stackSelection = Math.max(0, Math.min(maxIndex, stackSelection + delta));
render();
}
function beginStackMove() {
stackMode = 'move';
stackMoveSnapshot = calc.stack.slice();
render();
}
function restoreStackMoveSnapshot() {
if (!stackMoveSnapshot) return;
calc.stack = stackMoveSnapshot.slice();
stackMoveSnapshot = null;
render();
}
function validateStackMove() {
stackMoveSnapshot = null;
stackMode = 'normal';
render();
}
function moveSelectedStackValue(delta) {
const index = stackSelection;
const target = Math.max(0, Math.min(calc.stack.length - 1, index + delta));
if (target === index) return;
const value = calc.stack.splice(index, 1)[0];
calc.stack.splice(target, 0, value);
stackSelection = target;
render();
}
function moveEditCursor(delta) {
editCursor = Math.max(0, Math.min(calc.inputValue.length, editCursor + delta));
}
function pushEditingValueIfNeeded() { function pushEditingValueIfNeeded() {
if (!calc.isEditing) return; if (!calc.isEditing) return;
if (calc.inputValue !== '') { if (calc.inputValue !== '') {
calc.push(calc.parseInputValue(calc.inputValue)); calc.push(calc.parseInputValue(calc.inputValue));
} }
editRestoreValue = null;
calc.inputValue = ''; calc.inputValue = '';
calc.isEditing = false; calc.isEditing = false;
editCursor = 0;
}
function startEditingFromStackTop() {
if (!calc.isValidIndex(0)) return false;
const value = calc.stack[0];
editRestoreValue = value;
calc.remove(0);
calc.isEditing = true;
calc.inputValue = calc.formatNumber(value);
editCursor = calc.inputValue.length;
return true;
} }
function inputToX(value) { function inputToX(value) {
if (!calc.isEditing) { if (!calc.isEditing) {
calc.isEditing = true; calc.isEditing = true;
calc.inputValue = ''; calc.inputValue = '';
editCursor = 0;
} }
if (value === 'Backspace') { if (value === 'Backspace') {
calc.inputValue = calc.inputValue.slice(0, -1); if (editCursor > 0) {
calc.inputValue = `${calc.inputValue.slice(0, editCursor - 1)}${calc.inputValue.slice(editCursor)}`;
editCursor -= 1;
}
} else { } else {
calc.inputValue += value; calc.inputValue = `${calc.inputValue.slice(0, editCursor)}${value}${calc.inputValue.slice(editCursor)}`;
editCursor += value.length;
} }
if (calc.inputValue === '') { if (calc.inputValue === '') {
calc.isEditing = false; stopEditing();
} }
} }
@@ -218,18 +387,15 @@ function execute(name) {
} }
} else if (name === 'clear') { } else if (name === 'clear') {
calc.clear(); calc.clear();
calc.inputValue = ''; stopEditing(true);
calc.isEditing = false;
} else if (name === 'escape') { } else if (name === 'escape') {
calc.inputValue = ''; cancelEditing();
calc.isEditing = false;
} else if (name === 'backspace') { } else if (name === 'backspace') {
if (calc.isEditing) { if (calc.isEditing) {
inputToX('Backspace'); inputToX('Backspace');
} else if (calc.isValidIndex(0)) { } else if (calc.isValidIndex(0)) {
calc.remove(0); calc.remove(0);
} }
} else if (name === 'swap') { } else if (name === 'swap') {
pushEditingValueIfNeeded(); pushEditingValueIfNeeded();
if (calc.isValidIndex(1)) { if (calc.isValidIndex(1)) {
@@ -237,35 +403,26 @@ function execute(name) {
} }
} else if (name === 'neg') { } else if (name === 'neg') {
if (calc.isEditing) { if (calc.isEditing) {
calc.inputValue = calc.inputValue.startsWith('-') ? calc.inputValue.slice(1) : `-${calc.inputValue}`; const hasSign = calc.inputValue.startsWith('-');
calc.inputValue = hasSign ? calc.inputValue.slice(1) : `-${calc.inputValue}`;
moveEditCursor(hasSign ? -1 : 1);
} else { } else {
calc.push(calc.pop() * -1); calc.command('neg');
} }
} else if (name === 'pow10') {
pushEditingValueIfNeeded();
const exponent = calc.stack[0];
calc.remove(0);
calc.push(10);
calc.push(exponent);
calc.command('pow');
} else if (name === 'exp') {
pushEditingValueIfNeeded();
const exponent = calc.stack[0];
calc.remove(0);
calc.push(Math.E);
calc.push(exponent);
calc.command('pow');
} else { } else {
pushEditingValueIfNeeded(); pushEditingValueIfNeeded();
calc.command(name); calc.command(name);
} }
if (!calc.isEditing) {
editCursor = 0;
}
render(); render();
} catch (error) { } catch (error) {
setStatus(error?.message || 'Operation error', true); setStatus(error?.message || 'Operation error', true);
} }
} }
function createKeyButton({ label, input, action, spacer, className }) { function createKeyButton({ label, input, action, spacer, className, title }) {
if (spacer) { if (spacer) {
const div = document.createElement('div'); const div = document.createElement('div');
return div; return div;
@@ -274,6 +431,7 @@ function createKeyButton({ label, input, action, spacer, className }) {
button.type = 'button'; button.type = 'button';
button.textContent = label; button.textContent = label;
button.className = className; button.className = className;
if (title) button.title = title;
button.addEventListener('click', () => { button.addEventListener('click', () => {
if (input) { if (input) {
inputToX(input); inputToX(input);
@@ -304,6 +462,53 @@ async function copyStackValue(label) {
function handleKeyboard(event) { function handleKeyboard(event) {
if (event.defaultPrevented) return; if (event.defaultPrevented) return;
const key = event.key; const key = event.key;
if (stackMode === 'navigation') {
if (key === 'ArrowUp') {
event.preventDefault();
moveNavigationSelection(1);
return;
}
if (key === 'ArrowDown') {
event.preventDefault();
moveNavigationSelection(-1);
return;
}
if (key === 'Escape' || key === 'ArrowLeft') {
event.preventDefault();
exitStackMode();
return;
}
if (key === 'Enter') {
event.preventDefault();
beginStackMove();
return;
}
return;
}
if (stackMode === 'move') {
if (key === 'ArrowUp') {
event.preventDefault();
moveSelectedStackValue(1);
return;
}
if (key === 'ArrowDown') {
event.preventDefault();
moveSelectedStackValue(-1);
return;
}
if (key === 'Escape') {
event.preventDefault();
restoreStackMoveSnapshot();
exitStackMode();
return;
}
if (key === 'Enter') {
event.preventDefault();
validateStackMove();
return;
}
return;
}
if (/^[0-9.]$/.test(key)) { if (/^[0-9.]$/.test(key)) {
event.preventDefault(); event.preventDefault();
inputToX(key); inputToX(key);
@@ -321,16 +526,58 @@ function handleKeyboard(event) {
'/': 'div', '/': 'div',
'%': 'mod', '%': 'mod',
'^': 'pow', '^': 'pow',
s: 'sqr',
S: 'pow',
r: 'sqrt',
R: 'root',
x: 'recip',
d: 'pow10',
l: 'log',
L: 'log',
n: 'ln',
N: 'ln',
e: 'exp',
E: 'exp',
i: 'sin',
o: 'cos',
a: 'tan',
I: 'asin',
O: 'acos',
A: 'atan',
}; };
const arrowMap = { if (key === 'ArrowLeft') {
ArrowUp: upButton,
ArrowDown: downButton,
ArrowLeft: leftButton,
ArrowRight: rightButton,
};
if (arrowMap[key]) {
event.preventDefault(); event.preventDefault();
arrowMap[key].click(); if (calc.isEditing) {
moveEditCursor(-1);
render();
return;
}
leftButton.click();
return;
}
if (key === 'ArrowRight') {
event.preventDefault();
if (calc.isEditing) {
moveEditCursor(1);
render();
return;
}
rightButton.click();
return;
}
if (key === 'ArrowUp') {
event.preventDefault();
upButton.click();
return;
}
if (key === 'ArrowDown') {
event.preventDefault();
if (calc.isEditing) {
cancelEditing();
render();
return;
}
downButton.click();
return; return;
} }
if (map[key]) { if (map[key]) {
@@ -340,41 +587,49 @@ function handleKeyboard(event) {
} }
const modeOptions = ['deg', 'rad', 'grad']; const modeOptions = ['deg', 'rad', 'grad'];
let modeMenuEl = null; let activeMenuEl = null;
function closeModeMenu() { function closeModeMenu() {
if (modeMenuEl) { if (activeMenuEl) {
modeMenuEl.remove(); activeMenuEl.remove();
modeMenuEl = null; activeMenuEl = null;
} }
} }
function openMenu(anchorButton, items, onSelect) {
const rect = anchorButton.getBoundingClientRect();
const menu = document.createElement('div');
menu.className = 'menu-popup';
menu.style.top = `${rect.bottom + 6 + window.scrollY}px`;
menu.style.left = `${rect.left + window.scrollX}px`;
menu.style.minWidth = `${rect.width}px`;
for (const item of items) {
const button = document.createElement('button');
button.type = 'button';
button.className = `menu-popup-item${item.active ? ' is-active' : ''}`;
button.textContent = item.label;
button.addEventListener('click', () => onSelect(item.value));
menu.appendChild(button);
}
document.body.appendChild(menu);
return menu;
}
function toggleModeMenu() { function toggleModeMenu() {
if (modeMenuEl) { if (activeMenuEl) {
closeModeMenu(); closeModeMenu();
return; return;
} }
closeConstMenu(); closeConstMenu();
const rect = modeButton.getBoundingClientRect(); activeMenuEl = openMenu(modeButton, modeOptions.map((mode) => ({
modeMenuEl = document.createElement('div'); label: mode,
modeMenuEl.className = 'mode-menu'; value: mode,
modeMenuEl.style.top = `${rect.bottom + 6 + window.scrollY}px`; active: mode === calc.angleMode,
modeOptions.forEach((mode) => { })), (mode) => {
const button = document.createElement('button');
button.type = 'button';
button.className = `mode-menu-item${mode === calc.angleMode ? ' is-active' : ''}`;
button.textContent = mode;
button.addEventListener('click', () => {
calc.angleMode = mode; calc.angleMode = mode;
render(); render();
closeModeMenu(); closeModeMenu();
}); });
modeMenuEl.appendChild(button);
});
document.body.appendChild(modeMenuEl);
const menuRect = modeMenuEl.getBoundingClientRect();
const maxLeft = Math.max(8, window.innerWidth - menuRect.width - 8);
modeMenuEl.style.left = `${Math.max(8, Math.min(maxLeft, rect.left + window.scrollX))}px`;
} }
modeButton.addEventListener('click', (event) => { modeButton.addEventListener('click', (event) => {
@@ -385,6 +640,7 @@ modeButton.addEventListener('click', (event) => {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
closeModeMenu(); closeModeMenu();
closeConstMenu(); closeConstMenu();
render();
}); });
window.addEventListener('scroll', () => { window.addEventListener('scroll', () => {
closeModeMenu(); closeModeMenu();
@@ -398,10 +654,8 @@ window.addEventListener('click', (event) => {
if (label) copyStackValue(label); if (label) copyStackValue(label);
return; return;
} }
if (modeMenuEl && !event.target.closest('.mode-menu') && event.target !== modeButton) { if (activeMenuEl && !event.target.closest('.menu-popup') && event.target !== modeButton && event.target !== constButton) {
closeModeMenu(); closeModeMenu();
}
if (constMenuEl && !event.target.closest('.mode-menu') && event.target !== constButton) {
closeConstMenu(); closeConstMenu();
} }
}); });
@@ -422,54 +676,50 @@ hiddenInput.addEventListener('paste', (event) => {
pasteTextIntoStack(text); pasteTextIntoStack(text);
}); });
upButton.addEventListener('click', () => {}); upButton.addEventListener('click', () => {
if (!calc.isEditing && stackMode === 'normal') {
enterNavigationMode();
focusInput();
}
});
const constants = [ const constantLabels = {
{ label: 'π', value: Math.PI }, pi: 'π',
{ label: 'e', value: Math.E }, e: 'e',
{ label: 'φ', value: (1 + Math.sqrt(5)) / 2 }, phi: 'φ',
{ label: 'g', value: 9.80665 }, g: 'g',
{ label: 'c', value: 299792458 }, c: 'C',
]; };
const constantOrder = ['pi', 'e', 'phi', 'g', 'c'];
let constMenuEl = null;
function closeConstMenu() { function closeConstMenu() {
if (constMenuEl) { if (activeMenuEl) {
constMenuEl.remove(); activeMenuEl.remove();
constMenuEl = null; activeMenuEl = null;
} }
} }
function toggleConstMenu() { function toggleConstMenu() {
if (constMenuEl) { if (activeMenuEl) {
closeConstMenu(); closeConstMenu();
return; return;
} }
closeModeMenu(); closeModeMenu();
const rect = constButton.getBoundingClientRect(); const availableConstants = calc.listConstants();
constMenuEl = document.createElement('div'); const keys = [...constantOrder, ...Object.keys(availableConstants).filter((name) => !constantOrder.includes(name))]
constMenuEl.className = 'mode-menu'; .filter((name) => Object.prototype.hasOwnProperty.call(availableConstants, name));
constMenuEl.style.top = `${rect.bottom + 6 + window.scrollY}px`; activeMenuEl = openMenu(constButton, keys.map((name) => ({
constants.forEach((constant) => { label: constantLabels[name] ?? name,
const button = document.createElement('button'); value: name,
button.type = 'button'; })), (name) => {
button.className = 'mode-menu-item';
button.textContent = constant.label;
button.addEventListener('click', () => {
pushEditingValueIfNeeded(); pushEditingValueIfNeeded();
calc.push(constant.value); calc.push(availableConstants[name]);
render(); render();
clearStatus(); clearStatus();
closeConstMenu(); closeConstMenu();
focusInput(); focusInput();
}); });
constMenuEl.appendChild(button);
});
document.body.appendChild(constMenuEl);
const menuRect = constMenuEl.getBoundingClientRect();
const desiredLeft = rect.right + window.scrollX - menuRect.width;
constMenuEl.style.left = `${Math.max(8, desiredLeft)}px`;
} }
constButton.addEventListener('click', (event) => { constButton.addEventListener('click', (event) => {
@@ -477,32 +727,43 @@ constButton.addEventListener('click', (event) => {
toggleConstMenu(); toggleConstMenu();
}); });
leftButton.addEventListener('click', () => {}); leftButton.addEventListener('click', () => {
if (calc.isEditing) {
moveEditCursor(-1);
render();
focusInput();
return;
}
if (stackMode === 'navigation') {
exitStackMode();
focusInput();
}
});
downButton.addEventListener('click', () => { downButton.addEventListener('click', () => {
if (!calc.isEditing && calc.isValidIndex(0)) { if (!calc.isEditing && startEditingFromStackTop()) {
const value = calc.stack[0];
calc.remove(0);
calc.isEditing = true;
calc.inputValue = calc.formatNumber(value);
render(); render();
focusInput(); focusInput();
} }
}); });
rightButton.addEventListener('click', () => { rightButton.addEventListener('click', () => {
if (calc.isEditing) {
moveEditCursor(1);
render();
focusInput();
return;
}
execute('swap'); execute('swap');
}); });
window.addEventListener('keydown', handleKeyboard, { capture: true }); window.addEventListener('keydown', handleKeyboard, { capture: true });
window.addEventListener('load', focusInput); window.addEventListener('load', focusInput);
window.addEventListener('pageshow', focusInput); window.addEventListener('pageshow', focusInput);
window.addEventListener('focus', focusInput); window.addEventListener('focus', focusInput);
window.addEventListener('pointerdown', focusInput, true); window.addEventListener('pointerdown', focusInput, true);
window.addEventListener('mousedown', focusInput, true); window.addEventListener('mousedown', focusInput, true);
window.addEventListener('click', focusInput, true);
hiddenInput.setAttribute('inputmode', 'none'); hiddenInput.setAttribute('inputmode', 'none');
hiddenInput.setAttribute('readonly', 'readonly'); hiddenInput.setAttribute('readonly', 'readonly');
@@ -517,7 +778,7 @@ hiddenInput.addEventListener('focus', () => {
}); });
document.addEventListener('click', (event) => { document.addEventListener('click', (event) => {
if (!isTouchDevice && !event.target.closest('.mode-menu')) { if (!isTouchDevice && !event.target.closest('.menu-popup')) {
focusInput(); focusInput();
} }
}); });
-10
View File
@@ -1,10 +0,0 @@
┌──────────── Display ────────────┐ ┌────── Functions ─────┐ ┌──────────── Keypad ─────────────┐
| T: | | x^2 | y^x | 1/x | % | | +/- | Clear | Esc | backspace |
| Z: | | √x | y√x | 10^x | | | 7 | 8 | 9 | / |
| Y: | | log | ln | | | | 4 | 5 | 6 | * |
| X: | └──────────────────────┘ | 1 | 2 | 3 | - |
└─────────────────────────────────┘ ┌─────── Trigo ────────┐ | 0 | . | Enter | + |
┌──────── Display Buttons ────────┐ | sin | cos | tan | └─────────────────────────────────┘
| Mode | Paste | Up | Const | | asin | acos | atan |
| | Right | Down | Right | └──────────────────────┘
└─────────────────────────────────┘
@@ -1,26 +1,52 @@
# Calc 02 Visual Portrait
## Display
```
┌──────────── Display ────────────┐ ┌──────────── Display ────────────┐
| T: | | T: |
| Z: | | Z: |
| Y: | | Y: |
| X: | | X: |
└─────────────────────────────────┘ └─────────────────────────────────┘
```
## Display Buttons
```
┌──────── Display Buttons ────────┐ ┌──────── Display Buttons ────────┐
| Mode | Paste | Up | Const | | Const | Paste | Up | Mode |
| | Right | Down | Right | | | Left | Down | Right |
└─────────────────────────────────┘ └─────────────────────────────────┘
```
## Keypad
```
┌──────────── Keypad ─────────────┐ ┌──────────── Keypad ─────────────┐
| +/- | Clear | Esc | backspace | | Clear | Backspace | Esc | Enter |
| 7 | 8 | 9 | / | | 7 | 8 | 9 | / |
| 4 | 5 | 6 | * | | 4 | 5 | 6 | * |
| 1 | 2 | 3 | - | | 1 | 2 | 3 | - |
| 0 | . | Enter | + | | 0 | . | +/- | + |
└─────────────────────────────────┘ └─────────────────────────────────┘
┌─────────── Functions ───────────┐ ```
| x^2 | y^x | 1/x | % |
| √x | y√x | 10^x | | ## Functions
| log | ln | | |
```
┌──────────── Functions ──────────┐
| x^2 | √x | 1/x | % |
| y^x | y√x | 10^x | |
| log | ln | e^x | |
└─────────────────────────────────┘ └─────────────────────────────────┘
┌───────────── Trigo ─────────────┐ ```
## Trigo
```
┌──────────── Trigo ──────────────┐
| sin | cos | tan | | | sin | cos | tan | |
| asin | acos | atan | | | asin | acos | atan | |
└─────────────────────────────────┘ └─────────────────────────────────┘
```
+68 -1
View File
@@ -2,6 +2,9 @@ class RpnCalculator {
static CONSTANTS = { static CONSTANTS = {
pi: Math.PI, pi: Math.PI,
e: Math.E, e: Math.E,
phi: (1 + Math.sqrt(5)) / 2,
g: 9.80665,
c: 299792458,
}; };
static OPERATIONS = { static OPERATIONS = {
@@ -46,6 +49,18 @@ class RpnCalculator {
aliases: ['^', 'y^x'], aliases: ['^', 'y^x'],
execute: (calc, a, b) => Math.pow(a, b), execute: (calc, a, b) => Math.pow(a, b),
}, },
pow10: {
category: 'Arithmetic',
argCount: 1,
aliases: ['10^x'],
execute: (calc, a) => Math.pow(10, a),
},
exp: {
category: 'Arithmetic',
argCount: 1,
aliases: ['e^x'],
execute: (calc, a) => Math.exp(a),
},
root: { root: {
category: 'Arithmetic', category: 'Arithmetic',
argCount: 2, argCount: 2,
@@ -192,7 +207,7 @@ class RpnCalculator {
static getOperationsByCategory() { static getOperationsByCategory() {
return { return {
Stack: ['dup', 'drop', 'swap', 'clear', 'enter'], Stack: ['dup', 'drop', 'swap', 'clear', 'enter'],
Arithmetic: ['add', 'sub', 'mul', 'div', 'mod', 'pow', 'root', 'sqr', 'neg', 'sqrt', 'recip', 'log', 'ln'], Arithmetic: ['add', 'sub', 'mul', 'div', 'mod', 'pow', 'pow10', 'exp', 'root', 'sqr', 'neg', 'sqrt', 'recip', 'log', 'ln'],
Trigonometry: ['sin', 'cos', 'tan', 'asin', 'acos', 'atan'], Trigonometry: ['sin', 'cos', 'tan', 'asin', 'acos', 'atan'],
}; };
} }
@@ -212,6 +227,15 @@ class RpnCalculator {
this.enabledCommands = new Set(selectedCommands.map((name) => this.normalizeCommandName(name)).filter((name) => RpnCalculator.OPERATIONS[name])); this.enabledCommands = new Set(selectedCommands.map((name) => this.normalizeCommandName(name)).filter((name) => RpnCalculator.OPERATIONS[name]));
} }
static isValidConstantName(name) {
return typeof name === 'string' && name.trim() !== '';
}
static isReservedName(name) {
const normalized = typeof name === 'string' ? name.toLowerCase() : '';
return Boolean(RpnCalculator.OPERATIONS[normalized]);
}
toRadians(value) { toRadians(value) {
if (this.angleMode === 'grad') { if (this.angleMode === 'grad') {
return (value * Math.PI) / 200; return (value * Math.PI) / 200;
@@ -257,6 +281,45 @@ class RpnCalculator {
return typeof name === 'string' && Object.prototype.hasOwnProperty.call(this.constants, name.toLowerCase()); return typeof name === 'string' && Object.prototype.hasOwnProperty.call(this.constants, name.toLowerCase());
} }
setConstant(name, value) {
if (!RpnCalculator.isValidConstantName(name)) {
throw new Error('Invalid constant name');
}
if (!Number.isFinite(value)) {
throw new Error('Invalid constant value');
}
const normalized = name.trim().toLowerCase();
if (RpnCalculator.isReservedName(normalized)) {
throw new Error(`Constant name conflicts with a command: ${name}`);
}
this.constants[normalized] = value;
return value;
}
removeConstant(name) {
if (!RpnCalculator.isValidConstantName(name)) {
throw new Error('Invalid constant name');
}
const normalized = name.trim().toLowerCase();
if (!this.isConstantName(normalized)) {
return false;
}
delete this.constants[normalized];
return true;
}
hasConstant(name) {
if (!RpnCalculator.isValidConstantName(name)) {
return false;
}
return this.isConstantName(name.trim().toLowerCase());
}
push(value) { push(value) {
if (this.stack.length >= this.maxSize) { if (this.stack.length >= this.maxSize) {
throw new Error('Stack overflow'); throw new Error('Stack overflow');
@@ -408,6 +471,10 @@ class RpnCalculator {
getConstants() { getConstants() {
return { ...this.constants }; return { ...this.constants };
} }
listConstants() {
return this.getConstants();
}
} }
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {