diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 8db03ceb9..e79d168f5 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -9,7 +9,7 @@ ### Fixes -- Fix `n-image` preview toolbar error, closes [#4157](https://github.com/tusen-ai/naive-ui/issues/4157). +- Fix `n-image` error while operating the previewed image, closes [#4157](https://github.com/tusen-ai/naive-ui/issues/4157). - Fix `n-tree` cannot access `mergedFilterRef` before initialization error, closes [#4134](https://github.com/tusen-ai/naive-ui/issues/4134). - Fix `n-menu` can't override submenu dropdown's `trigger` by `dropdown-props`, closes [#4147](https://github.com/tusen-ai/naive-ui/issues/4147). @@ -18,6 +18,7 @@ ### Fixes - Fix `n-config-provider`'s katex type issue. +- Fix `n-image` error in toolbar operation during preview, closes [#4144](https://github.com/tusen-ai/naive-ui/issues/4144). ## 2.34.1 diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 1ff4d92c1..8b8883ede 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -9,7 +9,7 @@ ### Fixes -- 修复 `n-image` 的预览工具栏报错,关闭 [#4157](https://github.com/tusen-ai/naive-ui/issues/4157) +- 修复 `n-image` 操作预览图片时报错,关闭 [#4157](https://github.com/tusen-ai/naive-ui/issues/4157) - 修复 `n-tree` 的`cannot access 'mergedFilterRef' before initialization`报错,关闭 [#4134](https://github.com/tusen-ai/naive-ui/issues/4134) - 修复 `n-menu` 无法通过 `dropdown-props` 覆盖子菜单 dropdown 的 `trigger`,关闭 [#4147](https://github.com/tusen-ai/naive-ui/issues/4147) @@ -18,6 +18,7 @@ ### Fixes - 修复 `n-config-provider` 的 katex 的类型问题 +- 修复 `n-image` 预览工具栏操作报错,关闭 [#4144](https://github.com/tusen-ai/naive-ui/issues/4144) ## 2.34.1 diff --git a/src/image/src/ImagePreview.tsx b/src/image/src/ImagePreview.tsx index bb6c65e82..d12f19156 100644 --- a/src/image/src/ImagePreview.tsx +++ b/src/image/src/ImagePreview.tsx @@ -237,7 +237,7 @@ export default defineComponent({ const imageContext = inject(imageContextKey, null) function handlePreviewMousedown (e: MouseEvent): void { - imageContext?.previewedImgPropsRef.value.onMousedown?.(e) + imageContext?.previewedImgPropsRef.value?.onMousedown?.(e) if (e.button !== 0) return const { clientX, clientY } = e @@ -255,7 +255,7 @@ export default defineComponent({ on('mouseup', document, handleMouseUp) } function handlePreviewDblclick (e: MouseEvent): void { - imageContext?.previewedImgPropsRef.value.onDblclick?.(e) + imageContext?.previewedImgPropsRef.value?.onDblclick?.(e) const originalImageSizeScale = getOrignalImageSizeScale() scale = scale === originalImageSizeScale ? 1 : originalImageSizeScale derivePreviewStyle() @@ -341,9 +341,7 @@ export default defineComponent({ const { value: preview } = previewRef if (!preview) return const { style } = preview - const controlledStyle = normalizeStyle( - imageContext?.previewedImgPropsRef?.value?.style - ) + const controlledStyle = normalizeStyle(imageContext?.previewedImgPropsRef.value?.style) let controlledStyleString = '' if (typeof controlledStyle === 'string') { controlledStyleString = controlledStyle + ';' @@ -462,7 +460,7 @@ export default defineComponent({ displayedRef.value = false }, handleDragStart: (e: DragEvent) => { - imageContext?.previewedImgPropsRef.value.onDragstart?.(e) + imageContext?.previewedImgPropsRef.value?.onDragstart?.(e) e.preventDefault() }, zoomIn,