ryan/squoosh
1
0
Fork 0
forked from external-repos/squoosh
Code Pull Requests Activity

Changing crop updates and disables resize processor

Browse Source
This commit is contained in:
Jason Miller
2020-12-09 11:48:10 -05:00
parent e3b053db12
commit 213028cfdd
1 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/client/lazy-app/Compress/index.tsx
View File

@@ -11,6 +11,7 @@ import {
canDecodeImageType, canDecodeImageType,
abortable, abortable,
assertSignal, assertSignal,
shallowEqual,
} from '../util'; } from '../util';
import { import {
PreprocessorState, PreprocessorState,
@@ -447,25 +448,39 @@ export default class Compress extends Component<Props, State> {
const newRotate = preprocessorState.rotate.rotate; const newRotate = preprocessorState.rotate.rotate;
const orientationChanged = oldRotate % 180 !== newRotate % 180; const orientationChanged = oldRotate % 180 !== newRotate % 180;
const { crop } = preprocessorState;
const cropChanged = !shallowEqual(crop, this.state.preprocessorState.crop);
this.setState((state) => ({ this.setState((state) => ({
loading: true, loading: true,
preprocessorState, preprocessorState,
// Flip resize values if orientation has changed // Flip resize values if orientation has changed
sides: !orientationChanged sides:
? state.sides !orientationChanged && !cropChanged
: (state.sides.map((side) => { ? state.sides
const currentResizeSettings = : (state.sides.map((side) => {
side.latestSettings.processorState.resize; const currentResizeSettings =
const resizeSettings: Partial<ProcessorState['resize']> = { side.latestSettings.processorState.resize;
width: currentResizeSettings.height, let resizeSettings: Partial<ProcessorState['resize']>;
height: currentResizeSettings.width, if (cropChanged) {
}; const img = state.source?.decoded;
return cleanMerge( resizeSettings = {
side, enabled: false,
'latestSettings.processorState.resize', width: img ? img.width - crop.left - crop.right : undefined,
resizeSettings, height: img ? img.height - crop.top - crop.bottom : undefined,
); };
}) as [Side, Side]), } else {
resizeSettings = {
width: currentResizeSettings.height,
height: currentResizeSettings.width,
};
}
return cleanMerge(
side,
'latestSettings.processorState.resize',
resizeSettings,
);
}) as [Side, Side]),
})); }));
}; };