Skip to content
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

fix(zoom): Round scale before comparing against max and min values #1290

Merged
merged 2 commits into from
Nov 6, 2020
Merged

fix(zoom): Round scale before comparing against max and min values #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fff8927
fix(zoom): Round scale before comparing against max and min values
jstoffan Nov 6, 2020
5853e8f
Merge branch 'master' into react-ui-fix-zoom
mergify[bot] Nov 6, 2020
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
8 changes: 4 additions & 4 deletions src/lib/viewers/controls/zoom/ZoomControls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function ZoomControls({
onZoomOut,
scale = 1,
}: Props): JSX.Element {
const currentZoom = Math.round(scale * 100);
const currentScale = Math.round((scale + Number.EPSILON) * 100) / 100;
const maxScaleValue = isFinite(maxScale) ? Math.min(maxScale, MAX_SCALE) : MAX_SCALE;
const minScaleValue = isFinite(minScale) ? Math.max(minScale, MIN_SCALE) : MIN_SCALE;

Expand All @@ -31,7 +31,7 @@ export default function ZoomControls({
<button
className="bp-ZoomControls-button"
data-testid="bp-ZoomControls-out"
disabled={scale <= minScaleValue}
disabled={currentScale <= minScaleValue}
onClick={onZoomOut}
title={__('zoom_out')}
type="button"
Expand All @@ -42,11 +42,11 @@ export default function ZoomControls({
className="bp-ZoomControls-current"
data-testid="current-zoom"
title={__('zoom_current_scale')}
>{`${currentZoom}%`}</div>
>{`${Math.round(currentScale * 100)}%`}</div>
<button
className="bp-ZoomControls-button"
data-testid="bp-ZoomControls-in"
disabled={scale >= maxScaleValue}
disabled={currentScale >= maxScaleValue}
onClick={onZoomIn}
title={__('zoom_in')}
type="button"
Expand Down
27 changes: 14 additions & 13 deletions src/lib/viewers/controls/zoom/__tests__/ZoomControls-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,27 @@ describe('ZoomControls', () => {

describe('render', () => {
test.each`
minScale | scale | disabled
${null} | ${1} | ${false}
${0.5} | ${1} | ${false}
${0.5} | ${0.5} | ${true}
${-50} | ${0.1} | ${true}
${-50} | ${0.2} | ${false}
minScale | scale | disabled
${null} | ${1} | ${false}
${0.5} | ${1} | ${false}
${0.5} | ${0.5005} | ${true}
${0.5} | ${0.5} | ${true}
${-50} | ${0.1} | ${true}
${-50} | ${0.2} | ${false}
`('should set disabled for zoom out to $disabled for $scale / $minScale', ({ disabled, minScale, scale }) => {
const wrapper = getWrapper({ minScale, scale });

expect(getZoomOut(wrapper).prop('disabled')).toBe(disabled);
});

test.each`
maxScale | scale | disabled
${null} | ${1} | ${false}
${10} | ${1} | ${false}
${50} | ${10} | ${false}
${50} | ${50} | ${true}
${500} | ${100} | ${true}
${500} | ${99} | ${false}
maxScale | scale | disabled
${null} | ${1} | ${false}
${10} | ${1} | ${false}
${50} | ${49.9999} | ${true}
${50} | ${50} | ${true}
${500} | ${100} | ${true}
${500} | ${99} | ${false}
`('should set disabled for zoom in to $disabled for $scale / $maxScale', ({ disabled, maxScale, scale }) => {
const wrapper = getWrapper({ maxScale, scale });

Expand Down