mirror of
https://github.com/kokonect-link/cherrypick
synced 2024-10-31 23:31:48 +09:00
fix(frontend): #11386 でウィンドウの場合に正常に表示されない問題を修正
This commit is contained in:
parent
926f208fcf
commit
09f37fc9e5
@ -39,10 +39,18 @@ const ro = new ResizeObserver(entries => {
|
||||
}
|
||||
});
|
||||
|
||||
function getClientWidthWithCache(targetEl: HTMLElement, containerEl: HTMLElement) {
|
||||
async function getClientWidthWithCache(targetEl: HTMLElement, containerEl: HTMLElement, count = 0) {
|
||||
if (_DEV_) console.log('getClientWidthWithCache', { targetEl, containerEl, count, cache: widthCache.get(containerEl) });
|
||||
if (widthCache.has(containerEl)) return widthCache.get(containerEl)!;
|
||||
|
||||
const width = targetEl.clientWidth;
|
||||
|
||||
if (count <= 10 && width < 64) {
|
||||
// widthが64未満はおかしいのでリトライする
|
||||
await new Promise(resolve => setTimeout(resolve, 50));
|
||||
return getClientWidthWithCache(targetEl, containerEl, count + 1);
|
||||
}
|
||||
|
||||
widthCache.set(containerEl, width);
|
||||
ro.observe(containerEl);
|
||||
return width;
|
||||
@ -79,7 +87,7 @@ const count = $computed(() => props.mediaList.filter(media => previewable(media)
|
||||
* アスペクト比をmediaListWithOneImageAppearanceに基づいていい感じに調整する
|
||||
* aspect-ratioではなくheightを使う
|
||||
*/
|
||||
function calcAspectRatio() {
|
||||
async function calcAspectRatio() {
|
||||
if (!gallery.value || !root.value) return;
|
||||
|
||||
let img = props.mediaList[0];
|
||||
@ -90,7 +98,7 @@ function calcAspectRatio() {
|
||||
}
|
||||
|
||||
if (!container.value) container.value = getScrollContainer(root.value);
|
||||
const width = container.value ? getClientWidthWithCache(root.value, container.value) : root.value.clientWidth;
|
||||
const width = container.value ? await getClientWidthWithCache(root.value, container.value) : root.value.clientWidth;
|
||||
|
||||
const heightMin = (ratio: number) => {
|
||||
const imgResizeRatio = width / img.properties.width;
|
||||
|
Loading…
Reference in New Issue
Block a user