-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* main: Make Cypress more stable & add e2e test for error events when upload fails (#3662) @uppy/webcam: refactor to ESM (#3686) @uppy/audio: fix types (#3689) Only deploy on companion changes (#3677) @uppy/image-editor: refactor to ESM (#3685) Add `save` translation to Spanish locale (#3678)
- Loading branch information
Showing
35 changed files
with
908 additions
and
850 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| { | ||
| "baseUrl": "http://localhost:1234", | ||
| "defaultCommandTimeout": 8000 | ||
| "defaultCommandTimeout": 16000 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
packages/@uppy/image-editor/src/Editor.js → packages/@uppy/image-editor/src/Editor.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| import { UIPlugin } from '@uppy/core' | ||
| import { h } from 'preact' | ||
|
|
||
| import Editor from './Editor.jsx' | ||
| import packageJson from '../package.json' | ||
| import locale from './locale.js' | ||
|
|
||
| export default class ImageEditor extends UIPlugin { | ||
| static VERSION = packageJson.version | ||
|
|
||
| constructor (uppy, opts) { | ||
| super(uppy, opts) | ||
| this.id = this.opts.id || 'ImageEditor' | ||
| this.title = 'Image Editor' | ||
| this.type = 'editor' | ||
|
|
||
| this.defaultLocale = locale | ||
|
|
||
| const defaultCropperOptions = { | ||
| viewMode: 1, | ||
| background: false, | ||
| autoCropArea: 1, | ||
| responsive: true, | ||
| croppedCanvasOptions: {}, | ||
| } | ||
|
|
||
| const defaultActions = { | ||
| revert: true, | ||
| rotate: true, | ||
| granularRotate: true, | ||
| flip: true, | ||
| zoomIn: true, | ||
| zoomOut: true, | ||
| cropSquare: true, | ||
| cropWidescreen: true, | ||
| cropWidescreenVertical: true, | ||
| } | ||
|
|
||
| const defaultOptions = { | ||
| quality: 0.8, | ||
| } | ||
|
|
||
| this.opts = { | ||
| ...defaultOptions, | ||
| ...opts, | ||
| actions: { | ||
| ...defaultActions, | ||
| ...opts.actions, | ||
| }, | ||
| cropperOptions: { | ||
| ...defaultCropperOptions, | ||
| ...opts.cropperOptions, | ||
| }, | ||
| } | ||
|
|
||
| this.i18nInit() | ||
| } | ||
|
|
||
| // eslint-disable-next-line class-methods-use-this | ||
| canEditFile (file) { | ||
| if (!file.type || file.isRemote) { | ||
| return false | ||
| } | ||
|
|
||
| const fileTypeSpecific = file.type.split('/')[1] | ||
|
|
||
| if (/^(jpe?g|gif|png|bmp|webp)$/.test(fileTypeSpecific)) { | ||
| return true | ||
| } | ||
|
|
||
| return false | ||
| } | ||
|
|
||
| save = () => { | ||
| const saveBlobCallback = (blob) => { | ||
| const { currentImage } = this.getPluginState() | ||
|
|
||
| this.uppy.setFileState(currentImage.id, { | ||
| data: blob, | ||
| size: blob.size, | ||
| preview: null, | ||
| }) | ||
|
|
||
| const updatedFile = this.uppy.getFile(currentImage.id) | ||
| this.uppy.emit('thumbnail:request', updatedFile) | ||
| this.setPluginState({ | ||
| currentImage: updatedFile, | ||
| }) | ||
| this.uppy.emit('file-editor:complete', updatedFile) | ||
| } | ||
|
|
||
| const { currentImage } = this.getPluginState() | ||
|
|
||
| this.cropper.getCroppedCanvas(this.opts.cropperOptions.croppedCanvasOptions).toBlob( | ||
| saveBlobCallback, | ||
| currentImage.type, | ||
| this.opts.quality, | ||
| ) | ||
| } | ||
|
|
||
| storeCropperInstance = (cropper) => { | ||
| this.cropper = cropper | ||
| } | ||
|
|
||
| selectFile = (file) => { | ||
| this.uppy.emit('file-editor:start', file) | ||
| this.setPluginState({ | ||
| currentImage: file, | ||
| }) | ||
| } | ||
|
|
||
| install () { | ||
| this.setPluginState({ | ||
| currentImage: null, | ||
| }) | ||
|
|
||
| const { target } = this.opts | ||
| if (target) { | ||
| this.mount(target, this) | ||
| } | ||
| } | ||
|
|
||
| uninstall () { | ||
| this.unmount() | ||
| } | ||
|
|
||
| render () { | ||
| const { currentImage } = this.getPluginState() | ||
|
|
||
| if (currentImage === null || currentImage.isRemote) { | ||
| return null | ||
| } | ||
|
|
||
| return ( | ||
| <Editor | ||
| currentImage={currentImage} | ||
| storeCropperInstance={this.storeCropperInstance} | ||
| save={this.save} | ||
| opts={this.opts} | ||
| i18n={this.i18n} | ||
| /> | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.