Skip to content

Remove address width calculation #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krystian50 merged 2 commits into from
Apr 23, 2025
Merged

Remove address width calculation #366

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d339edc
Refactor MemoryRow and MemoryTable to remove unnecessary adress width…
krystian50 Apr 11, 2025
e35850f
Merge branch 'main' into remove-dynamic-memory-row-width
krystian50 Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions src/components/MemoryPreview/MemoryInfinite.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,11 @@ export const MemoryRow = ({
address,
bytes,
selectedAddress,
addressLength,
findMemoryForWorker,
}: {
address: number;
bytes: number[];
selectedAddress: number | null;
addressLength: number;
findMemoryForWorker: FindMemoryForWorkerType;
}) => {
const { numeralSystem } = useContext(NumeralSystemContext);
Expand All @@ -152,7 +150,8 @@ export const MemoryRow = ({
className="opacity-40 font-inconsolata"
style={{
fontVariantNumeric: "tabular-nums",
width: `${addressLength}ch`,
// (2^32).length = 10
width: `10ch`,
}}
>
{displayAddress}
Expand Down Expand Up @@ -189,7 +188,6 @@ export const MemoryTable = ({
const [isLoading, setIsLoading] = useState(false);
const memory = useSelector(selectMemoryForFirstWorker);
const parentRef = useRef<HTMLDivElement>(null);
const { numeralSystem } = useContext(NumeralSystemContext);
const hasPrevPage = !!memory && (memory.startAddress || 0) > 0;
const hasNextPage = !!memory && (memory.stopAddress || 0) < MAX_ADDRESS;
// Virtualizer setup
Expand Down Expand Up @@ -262,7 +260,7 @@ export const MemoryTable = ({
height: `${rowVirtualizer.getTotalSize()}px`,
}}
>
{rowVirtualizer.getVirtualItems().map((virtualRow, _, virtualRows) => {
{rowVirtualizer.getVirtualItems().map((virtualRow) => {
const index = virtualRow.index;
const style: React.CSSProperties = {
height: `${virtualRow.size}px`,
Expand All @@ -279,10 +277,6 @@ export const MemoryTable = ({
}

const { address, bytes } = memory.data[index];
const lastAddressLength = addressFormatter(
memory.data[virtualRows[virtualRows.length - 1].index].address,
numeralSystem,
).length;

return (
<div
Expand All @@ -296,7 +290,6 @@ export const MemoryTable = ({
address={address}
bytes={bytes}
selectedAddress={selectedAddress}
addressLength={lastAddressLength}
findMemoryForWorker={findMemoryForWorker}
/>
</div>
Expand Down
Loading