diff --git a/apps/settings/src/sections/profile-contact/components/AvatarSection.spec.ts b/apps/settings/src/sections/profile-contact/components/AvatarSection.spec.ts
index d5251e7d721cd..da974cff1c365 100644
--- a/apps/settings/src/sections/profile-contact/components/AvatarSection.spec.ts
+++ b/apps/settings/src/sections/profile-contact/components/AvatarSection.spec.ts
@@ -25,12 +25,25 @@ const mocks = vi.hoisted(() => {
showError: vi.fn(),
emit: vi.fn(),
blob: null as Blob | null,
+ imageScale: 1,
+ image: {
+ $ready: vi.fn(),
+ $getTransform: vi.fn(),
+ getBoundingClientRect: () => new DOMRect(10.5, 0, 200, 300),
+ },
+ selection: {
+ width: 300,
+ addEventListener: vi.fn(),
+ $change: vi.fn(),
+ $toCanvas: vi.fn(),
+ },
cropper: {
- replace: vi.fn(),
destroy: vi.fn(),
- getCroppedCanvas: vi.fn(() => ({ width: 1024 })),
- scale: vi.fn(),
+ getCropperCanvas: () => ({ getBoundingClientRect: () => new DOMRect(0, 0, 300, 300) }),
+ getCropperImage: () => mocks.image,
+ getCropperSelection: () => mocks.selection,
},
+ Cropper: vi.fn(),
}
})
@@ -53,12 +66,7 @@ vi.mock('@nextcloud/dialogs', () => {
}
return { FilePickerClosed: mocks.FilePickerClosed, getFilePickerBuilder: () => builder, showError: mocks.showError }
})
-vi.mock('cropperjs', () => ({
- default: vi.fn(function() {
- return mocks.cropper
- }),
-}))
-vi.mock('cropperjs/dist/cropper.css', () => ({}))
+vi.mock('cropperjs', () => ({ default: mocks.Cropper }))
vi.mock('./shared/VisibilityScopeControl.vue', () => ({ default: { render: () => h('div') } }))
const flushPromises = () => new Promise((resolve) => setTimeout(resolve))
@@ -81,6 +89,43 @@ async function click(wrapper: VueWrapper, label: string) {
await flushPromises()
}
+/**
+ * @param wrapper The mounted section
+ * @param type Mime type of the uploaded file
+ */
+async function upload(wrapper: VueWrapper, type = 'image/png') {
+ const input = wrapper.find('input[type="file"]')
+ Object.defineProperty(input.element, 'files', { value: [new File(['png'], 'avatar', { type })] })
+ await input.trigger('change')
+}
+
+/**
+ * @param wrapper The mounted section
+ */
+async function startCropping(wrapper: VueWrapper) {
+ await upload(wrapper)
+ await vi.waitFor(() => expect(mocks.selection.addEventListener).toHaveBeenCalled())
+}
+
+/**
+ * @param x Horizontal position of the selection
+ * @param y Vertical position of the selection
+ * @param size Width and height of the selection
+ */
+function changeSelection(x: number, y: number, size: number) {
+ const [, listener] = mocks.selection.addEventListener.mock.lastCall! as [string, (event: Event) => void]
+ const event = new CustomEvent('change', { cancelable: true, detail: { x, y, width: size, height: size } })
+ listener(event)
+ return event.defaultPrevented
+}
+
+/**
+ * Source of the picture passed to the cropper
+ */
+function croppedPicture() {
+ return (mocks.Cropper.mock.lastCall![0] as HTMLImageElement).src
+}
+
/**
* @param wrapper The mounted section
*/
@@ -91,48 +136,110 @@ function isCropperShown(wrapper: VueWrapper) {
describe('AvatarSection', () => {
beforeEach(() => {
vi.clearAllMocks()
- mocks.cropper.scale.mockReturnValue({ getCroppedCanvas: () => ({ toBlob: (callback: (blob: Blob | null) => void) => callback(mocks.blob) }) })
+ mocks.Cropper.mockImplementation(function() {
+ return mocks.cropper
+ })
+ mocks.image.$ready.mockResolvedValue({})
+ mocks.image.$getTransform.mockImplementation(() => [mocks.imageScale, 0, 0, mocks.imageScale, 0, 0])
+ mocks.selection.$toCanvas.mockResolvedValue({ toBlob: (callback: (blob: Blob | null) => void) => callback(mocks.blob) })
mocks.blob = new Blob(['avatar'], { type: 'image/png' })
+ mocks.imageScale = 1
})
it('rejects uploads that are no png or jpg', async () => {
const wrapper = await mountAvatarSection()
- const input = wrapper.find('input[type="file"]')
- Object.defineProperty(input.element, 'files', { value: [new File(['gif'], 'avatar.gif', { type: 'image/gif' })] })
- await input.trigger('change')
+ await upload(wrapper, 'image/gif')
expect(mocks.showError).toHaveBeenCalledWith('Please select a valid png or jpg file')
- expect(mocks.cropper.replace).not.toHaveBeenCalled()
+ expect(mocks.Cropper).not.toHaveBeenCalled()
expect(isCropperShown(wrapper)).toBe(false)
})
it('crops an uploaded picture', async () => {
const wrapper = await mountAvatarSection()
- const input = wrapper.find('input[type="file"]')
- Object.defineProperty(input.element, 'files', { value: [new File(['png'], 'avatar.png', { type: 'image/png' })] })
- await input.trigger('change')
- await vi.waitFor(() => expect(mocks.cropper.replace).toHaveBeenCalled())
+ await startCropping(wrapper)
+ expect(croppedPicture()).toBe('data:image/png;base64,cG5n')
+ expect(mocks.selection.$change).toHaveBeenCalledWith(11, 50, 199, 199)
expect(isCropperShown(wrapper)).toBe(true)
})
+ it('saves only once the picture is loaded', async () => {
+ mocks.image.$ready.mockReturnValue(new Promise(() => {}))
+ const wrapper = await mountAvatarSection()
+
+ await upload(wrapper)
+ await vi.waitFor(() => expect(mocks.image.$ready).toHaveBeenCalled())
+
+ const save = wrapper.findAll('button').find((button) => button.text() === 'Set as profile picture')!
+ expect(save.attributes('disabled')).toBeDefined()
+ })
+
+ it('keeps the selection inside the picture', async () => {
+ const wrapper = await mountAvatarSection()
+ await startCropping(wrapper)
+
+ expect(changeSelection(11, 0, 199)).toBe(false)
+ expect(changeSelection(11, 101, 199)).toBe(false)
+ expect(changeSelection(11, 102, 199)).toBe(true)
+ expect(changeSelection(10, 50, 199)).toBe(true)
+ expect(changeSelection(100, 50, 199)).toBe(true)
+ })
+
+ it('reports a picture that cannot be loaded', async () => {
+ mocks.image.$ready.mockRejectedValue(new Error('Failed to load the image source'))
+ const wrapper = await mountAvatarSection()
+
+ await upload(wrapper)
+ await vi.waitFor(() => expect(mocks.showError).toHaveBeenCalledWith('Error cropping profile picture'))
+
+ expect(mocks.selection.addEventListener).not.toHaveBeenCalled()
+ expect(isCropperShown(wrapper)).toBe(false)
+ })
+
+ it('replaces the previous cropper when cropping another picture', async () => {
+ const wrapper = await mountAvatarSection()
+ await startCropping(wrapper)
+ await click(wrapper, 'Cancel')
+
+ await upload(wrapper)
+ await vi.waitFor(() => expect(mocks.Cropper).toHaveBeenCalledTimes(2))
+
+ expect(mocks.cropper.destroy).toHaveBeenCalledOnce()
+ })
+
it('saves the cropped picture scaled down', async () => {
mocks.post.mockResolvedValue({ data: {} })
+ mocks.imageScale = 0.25
const wrapper = await mountAvatarSection(true)
+ await startCropping(wrapper)
await click(wrapper, 'Set as profile picture')
- expect(mocks.cropper.scale).toHaveBeenCalledWith(0.5, 0.5)
+ expect(mocks.selection.$toCanvas).toHaveBeenCalledWith({ width: 512 })
expect(mocks.post).toHaveBeenCalledWith(expect.any(String), expect.any(FormData))
expect(mocks.emit).toHaveBeenCalledWith('settings:avatar:updated', expect.any(Number))
expect(window.oc_userconfig.avatar.generated).toBe(false)
})
+ it('saves a small cropped picture in its original size', async () => {
+ mocks.post.mockResolvedValue({ data: {} })
+ mocks.imageScale = 1.5
+ const wrapper = await mountAvatarSection()
+ await startCropping(wrapper)
+
+ await click(wrapper, 'Set as profile picture')
+
+ expect(mocks.selection.$toCanvas).toHaveBeenCalledWith({ width: 200 })
+ expect(mocks.post).toHaveBeenCalled()
+ })
+
it('keeps the previous picture when saving the cropped one fails', async () => {
mocks.post.mockRejectedValue(new Error('500'))
const wrapper = await mountAvatarSection(true)
+ await startCropping(wrapper)
await click(wrapper, 'Set as profile picture')
@@ -144,11 +251,24 @@ describe('AvatarSection', () => {
it('reports a picture that cannot be cropped', async () => {
mocks.blob = null
const wrapper = await mountAvatarSection()
+ await startCropping(wrapper)
+
+ await click(wrapper, 'Set as profile picture')
+
+ expect(mocks.showError).toHaveBeenCalledWith('Error cropping profile picture')
+ expect(mocks.post).not.toHaveBeenCalled()
+ })
+
+ it('reports a picture that fails to render', async () => {
+ mocks.selection.$toCanvas.mockRejectedValue(new Error('Failed to load the image source'))
+ const wrapper = await mountAvatarSection()
+ await startCropping(wrapper)
await click(wrapper, 'Set as profile picture')
expect(mocks.showError).toHaveBeenCalledWith('Error cropping profile picture')
expect(mocks.post).not.toHaveBeenCalled()
+ expect(isCropperShown(wrapper)).toBe(false)
})
it('does nothing when the file picker is closed', async () => {
@@ -180,7 +300,7 @@ describe('AvatarSection', () => {
await click(wrapper, 'Choose from Nextcloud Files')
- expect(mocks.cropper.replace).toHaveBeenCalledWith('data:image/png;base64,')
+ expect(croppedPicture()).toBe('data:image/png;base64,')
expect(isCropperShown(wrapper)).toBe(true)
})
diff --git a/apps/settings/src/sections/profile-contact/components/AvatarSection.vue b/apps/settings/src/sections/profile-contact/components/AvatarSection.vue
index 4753d6f695014..7845aa7ba6849 100644
--- a/apps/settings/src/sections/profile-contact/components/AvatarSection.vue
+++ b/apps/settings/src/sections/profile-contact/components/AvatarSection.vue
@@ -15,7 +15,7 @@ import { loadState } from '@nextcloud/initial-state'
import { t } from '@nextcloud/l10n'
import { generateUrl } from '@nextcloud/router'
import Cropper from 'cropperjs'
-import { onBeforeUnmount, onMounted, ref, useTemplateRef } from 'vue'
+import { nextTick, onBeforeUnmount, onMounted, ref, useTemplateRef } from 'vue'
import NcAvatar from '@nextcloud/vue/components/NcAvatar'
import NcButton from '@nextcloud/vue/components/NcButton'
import NcFormBox from '@nextcloud/vue/components/NcFormBox'
@@ -25,13 +25,21 @@ import VisibilityScopeControl from './shared/VisibilityScopeControl.vue'
import { NAME_READABLE_ENUM } from '../../../constants/AccountPropertyConstants.ts'
import logger from '../../../logger.ts'
-import 'cropperjs/dist/cropper.css'
-
const { avatar } = loadState<{ avatar: IAccountProperty }>('settings', 'personalInfoParameters')
const { avatarChangeSupported } = loadState<{ avatarChangeSupported: boolean }>('settings', 'accountParameters')
const profileEnabledGlobally = loadState('settings', 'profileEnabledGlobally', true)
const VALID_MIME_TYPES = ['image/png', 'image/jpeg']
+const MAX_AVATAR_SIZE = 512
+
+const CROPPER_TEMPLATE = ''
+ + ''
+ + ''
+ + ''
+ + ''
+ + ['n', 'e', 's', 'w', 'ne', 'nw', 'se', 'sw'].map((direction) => ``).join('')
+ + ''
+ + ''
const picker = getFilePickerBuilder(t('settings', 'Choose your profile picture'))
.setMultiSelect(false)
@@ -45,6 +53,7 @@ const readable = NAME_READABLE_ENUM[avatar.name]
const scope = ref(avatar.scope)
const showCropper = ref(false)
+const cropperReady = ref(false)
const loading = ref(false)
const version = ref(window.oc_userconfig.avatar.version)
const isGenerated = ref(window.oc_userconfig.avatar.generated)
@@ -54,16 +63,6 @@ const cropperImage = useTemplateRef('cropperImage')
let cropper: Cropper | undefined
onMounted(() => {
- cropper = new Cropper(cropperImage.value!, {
- aspectRatio: 1 / 1,
- viewMode: 1,
- guides: false,
- center: false,
- highlight: false,
- autoCropArea: 1,
- minContainerWidth: 300,
- minContainerHeight: 300,
- })
subscribe('settings:display-name:updated', handleDisplayNameUpdate)
})
@@ -72,6 +71,68 @@ onBeforeUnmount(() => {
unsubscribe('settings:display-name:updated', handleDisplayNameUpdate)
})
+/**
+ * Show the cropper for a picture
+ *
+ * @param src URL of the picture
+ */
+async function startCropping(src: string) {
+ // The cropper measures its container, so it must be visible before the picture loads
+ showCropper.value = true
+ cropperReady.value = false
+ await nextTick()
+
+ cropper?.destroy()
+ cropperImage.value!.src = src
+ const currentCropper = new Cropper(cropperImage.value!, { template: CROPPER_TEMPLATE })
+ cropper = currentCropper
+ try {
+ await currentCropper.getCropperImage()!.$ready()
+ } catch (error) {
+ logger.error('Could not load the profile picture', { error })
+ showError(t('settings', 'Error cropping profile picture'))
+ cancel()
+ return
+ }
+
+ // Select the largest centered square of the picture
+ const { left, top, right, bottom } = getImageBounds(currentCropper)
+ const size = Math.min(right - left, bottom - top)
+ const selection = currentCropper.getCropperSelection()!
+ selection.$change(left + Math.floor((right - left - size) / 2), top + Math.floor((bottom - top - size) / 2), size, size)
+ selection.addEventListener('change', keepSelectionInImage)
+ cropperReady.value = true
+}
+
+/**
+ * Get the full pixels of the cropper canvas that show the picture
+ *
+ * @param currentCropper The cropper showing the picture
+ */
+function getImageBounds(currentCropper: Cropper) {
+ const canvasRect = currentCropper.getCropperCanvas()!.getBoundingClientRect()
+ const imageRect = currentCropper.getCropperImage()!.getBoundingClientRect()
+ return {
+ left: Math.ceil(imageRect.left - canvasRect.left),
+ top: Math.ceil(imageRect.top - canvasRect.top),
+ right: Math.floor(imageRect.right - canvasRect.left),
+ bottom: Math.floor(imageRect.bottom - canvasRect.top),
+ }
+}
+
+/**
+ * Prevent selection changes that leave the picture
+ *
+ * @param event Change event of the cropper selection
+ */
+function keepSelectionInImage(event: Event) {
+ const { x, y, width, height } = (event as CustomEvent<{ x: number, y: number, width: number, height: number }>).detail
+ const { left, top, right, bottom } = getImageBounds(cropper!)
+ if (x < left || y < top || x + width > right || y + height > bottom) {
+ event.preventDefault()
+ }
+}
+
/**
* Open the native file picker
*/
@@ -94,10 +155,7 @@ function onChange(event: Event) {
}
const reader = new FileReader()
- reader.onload = () => {
- cropper!.replace(reader.result as string)
- showCropper.value = true
- }
+ reader.onload = () => startCropping(reader.result as string)
reader.readAsDataURL(file)
}
@@ -121,8 +179,7 @@ async function openFilePicker() {
if (data.status === 'success') {
handleAvatarUpdate(false)
} else if (data.data === 'notsquare') {
- cropper!.replace(data.image)
- showCropper.value = true
+ await startCropping(data.image)
} else {
showError(data.data.message)
cancel()
@@ -136,14 +193,26 @@ async function openFilePicker() {
/**
* Upload the cropped picture
*/
-function saveAvatar() {
+async function saveAvatar() {
+ const selection = cropper!.getCropperSelection()!
+ // The selection is measured in displayed pixels, the picture is scaled down to fit the canvas
+ const [imageScale] = cropper!.getCropperImage()!.$getTransform()
+ const width = Math.min(Math.round(selection.width / imageScale), MAX_AVATAR_SIZE)
+
showCropper.value = false
loading.value = true
- const canvasData = cropper!.getCroppedCanvas()
- const scaleFactor = canvasData.width > 512 ? 512 / canvasData.width : 1
+ let canvas: HTMLCanvasElement
+ try {
+ canvas = await selection.$toCanvas({ width })
+ } catch (error) {
+ logger.error('Could not crop the profile picture', { error })
+ showError(t('settings', 'Error cropping profile picture'))
+ cancel()
+ return
+ }
- cropper!.scale(scaleFactor, scaleFactor).getCroppedCanvas().toBlob(async (blob) => {
+ canvas.toBlob(async (blob) => {
if (blob === null) {
showError(t('settings', 'Error cropping profile picture'))
cancel()
@@ -215,6 +284,7 @@ function handleDisplayNameUpdate() {
{{ t('settings', 'Set as profile picture') }}
@@ -333,14 +403,18 @@ function handleDisplayNameUpdate() {
.cropperCanvas {
width: 300px;
height: 300px;
- overflow: hidden;
img {
- display: block;
- max-width: 100%;
+ display: none;
+ }
+
+ :global(cropper-canvas) {
+ width: 100%;
+ height: 100%;
}
- :global(.cropper-view-box) {
+ // Preview the round avatar without clipping the saved picture
+ :global(cropper-shade) {
border-radius: 50%;
}
}
diff --git a/package-lock.json b/package-lock.json
index 03a5eec7fb827..ce794f4d593c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
"browserslist-useragent-regexp": "^4.1.4",
"color": "^5.0.3",
"core-js": "^3.51.0",
- "cropperjs": "^1.7.0",
+ "cropperjs": "^2.3.1",
"debounce": "^3.0.0",
"dompurify": "^3.4.17",
"escape-html": "^1.0.3",
@@ -1763,6 +1763,126 @@
"vue": "^3.2.0"
}
},
+ "node_modules/@cropper/element": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@cropper/element/-/element-2.3.1.tgz",
+ "integrity": "sha512-CgrLOx0qERWlfJK1Ed6ePq7SXcB6gLHtj3mtDVypyzti70fJdmNxrFm5Ucbq8vpp2Yo3tW2L6uDI0IBDoiT17A==",
+ "license": "MIT",
+ "dependencies": {
+ "@cropper/utils": "^2.3.1"
+ }
+ },
+ "node_modules/@cropper/element-canvas": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@cropper/element-canvas/-/element-canvas-2.3.1.tgz",
+ "integrity": "sha512-UH3VMyjn58PdwYkPiTHuvRUjGzmyKr6E2pYWxTxN/04wnjgYLA77B5u5c1HhV6vD1ZKSvxJ/i9TkiySR9P1D6A==",
+ "license": "MIT",
+ "dependencies": {
+ "@cropper/element": "^2.3.1",
+ "@cropper/utils": "^2.3.1"
+ }
+ },
+ "node_modules/@cropper/element-crosshair": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@cropper/element-crosshair/-/element-crosshair-2.3.1.tgz",
+ "integrity": "sha512-Vz2heRwr2nd2rZ161vKyE4JwYV3eSodGCGGZq39TR0LICGOOeggLq0R664Af/eFB9PU8+tfJ42lWLoUdxQlVJQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@cropper/element": "^2.3.1",
+ "@cropper/utils": "^2.3.1"
+ }
+ },
+ "node_modules/@cropper/element-grid": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@cropper/element-grid/-/element-grid-2.3.1.tgz",
+ "integrity": "sha512-6LDaUDxH2xdA7biTcqnihPQVHjlT4bXysA403s9rU4jo5f4pPnFHtNbB+FQTYKNz5EKun52WgVtR+6oWbmbxlg==",
+ "license": "MIT",
+ "dependencies": {
+ "@cropper/element": "^2.3.1",
+ "@cropper/utils": "^2.3.1"
+ }
+ },
+ "node_modules/@cropper/element-handle": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@cropper/element-handle/-/element-handle-2.3.1.tgz",
+ "integrity": "sha512-ygLw89PWu9k8SuKW7rjRBpD6ZfmtVr5ayWux9YKHU7PxX0SeL5kbCD+PpOxQB1ycW4UcyH0tHt77EWnsdSoOHw==",
+ "license": "MIT",
+ "dependencies": {
+ "@cropper/element": "^2.3.1",
+ "@cropper/utils": "^2.3.1"
+ }
+ },
+ "node_modules/@cropper/element-image": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@cropper/element-image/-/element-image-2.3.1.tgz",
+ "integrity": "sha512-rPE7OX/BPTw66+DjpN5aOuPb1xSAjQMgAJZXdRgmeJnn0YcDDhfGQm8VwcL8/PMLxtWFcKEM+aUiezbO01j4fg==",
+ "license": "MIT",
+ "dependencies": {
+ "@cropper/element": "^2.3.1",
+ "@cropper/element-canvas": "^2.3.1",
+ "@cropper/utils": "^2.3.1"
+ }
+ },
+ "node_modules/@cropper/element-selection": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@cropper/element-selection/-/element-selection-2.3.1.tgz",
+ "integrity": "sha512-b8sabaFbHeQYY459uItDIeDY0IisZBO/wF+SYhKvAgI8TExj/f2mNcBZXjPHYCkWel2+1BSUTTNZxy+tR8sDEA==",
+ "license": "MIT",
+ "dependencies": {
+ "@cropper/element": "^2.3.1",
+ "@cropper/element-canvas": "^2.3.1",
+ "@cropper/element-image": "^2.3.1",
+ "@cropper/utils": "^2.3.1"
+ }
+ },
+ "node_modules/@cropper/element-shade": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@cropper/element-shade/-/element-shade-2.3.1.tgz",
+ "integrity": "sha512-X5ceZsy7iBxuIRhsL05H9+cPYzxZuvM7/9j5irXIbNsDiNwTedxIHdjhEhPbUYa+FaNn9wsKId24AEyH43JTGw==",
+ "license": "MIT",
+ "dependencies": {
+ "@cropper/element": "^2.3.1",
+ "@cropper/element-canvas": "^2.3.1",
+ "@cropper/element-selection": "^2.3.1",
+ "@cropper/utils": "^2.3.1"
+ }
+ },
+ "node_modules/@cropper/element-viewer": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@cropper/element-viewer/-/element-viewer-2.3.1.tgz",
+ "integrity": "sha512-EdrYDbnkj0IOl/kyWKzzvcDRobr7Tfzho7FkVu8mpSk1ILDHmVf8pfZrYVwou8l4znLqp8ZqwuabAezJPfC2Yg==",
+ "license": "MIT",
+ "dependencies": {
+ "@cropper/element": "^2.3.1",
+ "@cropper/element-canvas": "^2.3.1",
+ "@cropper/element-image": "^2.3.1",
+ "@cropper/element-selection": "^2.3.1",
+ "@cropper/utils": "^2.3.1"
+ }
+ },
+ "node_modules/@cropper/elements": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@cropper/elements/-/elements-2.3.1.tgz",
+ "integrity": "sha512-+D5rFlfFlWSL1lp0vPYI59/R6XM2vMnTSX0/B1zKRvmkc0t0N0m9lxVsaDb+9RkHx6PwAkBBNPZSRUeau33jMg==",
+ "license": "MIT",
+ "dependencies": {
+ "@cropper/element": "^2.3.1",
+ "@cropper/element-canvas": "^2.3.1",
+ "@cropper/element-crosshair": "^2.3.1",
+ "@cropper/element-grid": "^2.3.1",
+ "@cropper/element-handle": "^2.3.1",
+ "@cropper/element-image": "^2.3.1",
+ "@cropper/element-selection": "^2.3.1",
+ "@cropper/element-shade": "^2.3.1",
+ "@cropper/element-viewer": "^2.3.1"
+ }
+ },
+ "node_modules/@cropper/utils": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@cropper/utils/-/utils-2.3.1.tgz",
+ "integrity": "sha512-b5qFTwws/osx0asIGLK1V//hdL08frGvfpi6s+p6zj5XH05ofVcz0Xl+Tot7sUx12pbfhhAlsquQTOJ1IsOoFw==",
+ "license": "MIT"
+ },
"node_modules/@csstools/css-calc": {
"version": "3.4.3",
"resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.4.3.tgz",
@@ -8247,10 +8367,14 @@
"license": "MIT"
},
"node_modules/cropperjs": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.7.0.tgz",
- "integrity": "sha512-AkGnZxr7xAJBa63ObXq5ZKLkh9c8wisC+Ym8VzIDn3KZ+6qRTbBnOl2w2dFOTMzLP5IcfOpEK9PICDywNXhncg==",
- "license": "MIT"
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-2.3.1.tgz",
+ "integrity": "sha512-bgy+iHRFjsBxBCriXkTuFuHRJGSGZISuqDGhDQG7gLK0F7qOzhH06bdXzGf4b0bZSQ+mApakybiW9xvKnS9dbg==",
+ "license": "MIT",
+ "dependencies": {
+ "@cropper/elements": "^2.3.1",
+ "@cropper/utils": "^2.3.1"
+ }
},
"node_modules/cross-spawn": {
"version": "7.0.6",
diff --git a/package.json b/package.json
index a13157422fe7b..81c8059661c0f 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
"browserslist-useragent-regexp": "^4.1.4",
"color": "^5.0.3",
"core-js": "^3.51.0",
- "cropperjs": "^1.7.0",
+ "cropperjs": "^2.3.1",
"debounce": "^3.0.0",
"dompurify": "^3.4.17",
"escape-html": "^1.0.3",