Skip to content

[pull] dev from element-plus:dev #705

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

Merged
pull merged 2 commits into from
Sep 26, 2026
Merged

[pull] dev from element-plus:dev #705

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
8928bcc
chore(deps): update pnpm to v12.6.0 (#24923)
renovate[bot] Sep 26, 2026
52cf5b9
docs(components): [image/image-viewer] correctly describe the `viewe…
ixyzorg Sep 26, 2026
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
13 changes: 7 additions & 6 deletions docs/en-US/component/image.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,12 @@ image/custom-progress

### Image Slots

| Name | Description | Type |
| ----------------------------------------- | --------------------------------------------------------------------- | ---- |
| placeholder | custom placeholder content when image hasn't loaded yet. | - |
| error | custom image load failed content. | - |
| [image viewer slots](#image-viewer-slots) | when you allow big image preview, image viewer slots all can be used. | - |
| Name | Description | Type |
| ----------------------------------------- | --------------------------------------------------------------------------------------- | ---- |
| placeholder | custom placeholder content when image hasn't loaded yet. | - |
| error | custom image load failed content. | - |
| viewer | custom content when image preview. | - |
| [image viewer slots](#image-viewer-slots) | when you allow big image preview, image viewer slots all can be used, except `default`. | - |

### Image Exposes

Expand Down Expand Up @@ -162,7 +163,7 @@ image/custom-progress

| Name | Description | Type |
| ---------------------- | ---------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| viewer | custom content | - |
| default | custom content | - |
| progress ^(2.9.4) | custom progress content (Priority is higher than `show-progress` prop) | ^[object]`{ activeIndex: number, total: number }` |
| toolbar ^(2.9.4) | custom toolbar content | ^[object]`{ actions: (action: ImageViewerAction, options?: ImageViewerActionOptions) => void, prev: () => void, next: () => void, reset: () => void, activeIndex: number, setActiveItem: (index: number) => void }` |
| viewer-error ^(2.11.3) | custom image load failed content. | ^[object]`{ activeIndex: number, src: string }` |
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"packageManager": "pnpm@12.5.1",
"packageManager": "pnpm@12.6.0",
"workspaces": [
"packages/*",
"play",
Expand Down
122 changes: 61 additions & 61 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading