Skip to content

fix(image): fix preview image demo's bug #664

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
merged 1 commit into from
Oct 26, 2023
Merged

fix(image): fix preview image demo's bug #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion packages/renderless/src/image-viewer/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,10 +467,14 @@ export const getImageWidth =
}

state.imageList = vm.$refs.viewerItem
} else {
} else if (mode === 'mobile') {
imageW = parent.$el.querySelector('.tiny-mobile-image-viewer__canvas').offsetWidth

state.imageList = parent.$el.querySelectorAll('.tiny-mobile-image-viewer__item')
} else {
imageW = parent.$el.querySelector('.tiny-image-viewer__canvas').offsetWidth

state.imageList = parent.$el.querySelectorAll('.tiny-image-viewer__img')
}

state.imageItemWidth = imageW
Expand Down
2 changes: 0 additions & 2 deletions packages/renderless/src/image/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ export const loadImage =
() => {
state.loading = true
state.error = false

const img = new Image()

img.onload = (event) => api.handleLoad(event, img)
Expand All @@ -67,7 +66,6 @@ export const handleLoad =
state.imageWidth = img.width
state.imageHeight = img.height
state.loading = false

emit('load', event)
}

Expand Down
194 changes: 96 additions & 98 deletions packages/theme/src/image-viewer/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,122 +15,120 @@
@import './vars.less';

@image-viewer-prefix-cls: ~'@{css-prefix}image-viewer';
@image-prefix-cls: ~'@{css-prefix}image';

.@{image-prefix-cls} {
.@{image-viewer-prefix-cls} {
.component-css-vars-image-viewer();
.@{image-viewer-prefix-cls} {
&__wrapper {
background: var(--ti-image-viewer-mask-wrap-bg-color);
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
}

&__btn {
position: absolute;
z-index: 1;
display: flex;
align-items: center;
justify-content: center;
border-radius: 50%;
opacity: var(--ti-image-viewer-btn-opacity);
box-sizing: border-box;
.user-select(none);

svg {
fill: var(--ti-image-viewer-text-color);
}
}

&__close {
top: var(--ti-image-viewer-close-top);
right: var(--ti-image-viewer-close-right);
width: var(--ti-image-viewer-close-width);
height: var(--ti-image-viewer-close-height);
font-size: var(--ti-image-viewer-close-font-size);
background-color: var(--ti-image-viewer-close-bg-color);
&__wrapper {
background: var(--ti-image-viewer-mask-wrap-bg-color);
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
}

&:hover {
cursor: pointer;
background-color: var(--ti-image-viewer-close-bg-color-hover);
}
&__btn {
position: absolute;
z-index: 1;
display: flex;
align-items: center;
justify-content: center;
border-radius: 50%;
opacity: var(--ti-image-viewer-btn-opacity);
box-sizing: border-box;
.user-select(none);

svg {
fill: var(--ti-image-viewer-text-color);
}
}

&__canvas {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
&__close {
top: var(--ti-image-viewer-close-top);
right: var(--ti-image-viewer-close-right);
width: var(--ti-image-viewer-close-width);
height: var(--ti-image-viewer-close-height);
font-size: var(--ti-image-viewer-close-font-size);
background-color: var(--ti-image-viewer-close-bg-color);

&:hover {
cursor: pointer;
background-color: var(--ti-image-viewer-close-bg-color-hover);
}
}

&__actions {
left: 50%;
bottom: var(--ti-image-viewer-actions-bottom);
transform: translateX(-50%);
width: var(--ti-image-viewer-actions-width);
height: var(--ti-image-viewer-actions-height);
padding: 0 23px;
background-color: var(--ti-image-viewer-close-bg-color);
border-radius: var(--ti-image-viewer-actions-border-radius);
}
&__canvas {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}

&__actions-inner {
width: 100%;
height: 100%;
text-align: justify;
cursor: default;
font-size: var(--ti-image-viewer-actions-inner-font-size);
display: flex;
align-items: center;
justify-content: var(--ti-image-viewer-actions-inner-justify-content);

svg {
fill: var(--ti-image-viewer-actions-inner-text-color);
margin-right: 20px;

&:hover {
cursor: pointer;
}
}
}
&__actions {
left: 50%;
bottom: var(--ti-image-viewer-actions-bottom);
transform: translateX(-50%);
width: var(--ti-image-viewer-actions-width);
height: var(--ti-image-viewer-actions-height);
padding: 0 23px;
background-color: var(--ti-image-viewer-close-bg-color);
border-radius: var(--ti-image-viewer-actions-border-radius);
}

&__next,
&__prev {
top: 50%;
width: var(--ti-image-viewer-next-width);
height: var(--ti-image-viewer-next-height);
font-size: var(--ti-image-viewer-next-font-size);
background-color: var(--ti-image-viewer-close-bg-color);
&__actions-inner {
width: 100%;
height: 100%;
text-align: justify;
cursor: default;
font-size: var(--ti-image-viewer-actions-inner-font-size);
display: flex;
align-items: center;
justify-content: var(--ti-image-viewer-actions-inner-justify-content);

svg {
fill: var(--ti-image-viewer-actions-inner-text-color);
margin-right: 20px;

&:hover {
cursor: pointer;
background-color: var(--ti-image-viewer-close-bg-color-hover);
}
}
}

&__prev {
transform: translateY(-50%);
left: 40px;
&__next,
&__prev {
top: 50%;
width: var(--ti-image-viewer-next-width);
height: var(--ti-image-viewer-next-height);
font-size: var(--ti-image-viewer-next-font-size);
background-color: var(--ti-image-viewer-close-bg-color);

&:hover {
cursor: pointer;
background-color: var(--ti-image-viewer-close-bg-color-hover);
}
}

&__next {
transform: translateY(-50%);
right: 40px;
text-indent: 2px;
}
&__prev {
transform: translateY(-50%);
left: 40px;
}

&__mask {
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
opacity: 0.5;
background: var(--ti-image-viewer-mask-bg-color);
}
&__next {
transform: translateY(-50%);
right: 40px;
text-indent: 2px;
}

&__mask {
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
opacity: 0.5;
background: var(--ti-image-viewer-mask-bg-color);
}
}
2 changes: 1 addition & 1 deletion packages/vue/src/image-viewer/src/pc.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
-->
<template>
<transition name="viewer-fade">
<div class="tiny-image-viewer__wrapper" :style="{ 'z-index': state.zIndex }" @mousewheel.prevent>
<div class="tiny-image-viewer tiny-image-viewer__wrapper" :style="{ 'z-index': state.zIndex }" @mousewheel.prevent>
<div class="tiny-image-viewer__mask"></div>
<!-- CLOSE -->
<span class="tiny-image-viewer__btn tiny-image-viewer__close" @click="hide">
Expand Down