Skip to content
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

fix: transitions & thumbs performance bottleneck #678

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: transitions & thumbs performance bottleneck #678

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
14 changes: 2 additions & 12 deletions abstract/Block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @ts-check
import { BaseComponent, Data } from '@symbiotejs/symbiote';
import { initialConfig } from '../blocks/Config/initialConfig.js';

Check warning on line 3 in abstract/Block.js

View workflow job for this annotation

GitHub Actions / build 

'initialConfig' is defined but never used
import { EventEmitter } from '../blocks/UploadCtxProvider/EventEmitter.js';
import { WindowHeightTracker } from '../utils/WindowHeightTracker.js';
import { extractFilename, extractCdnUrlModifiers, extractUuid } from '../utils/cdn-utils.js';
Expand Down Expand Up @@ -174,6 +174,7 @@
if (!this.has('*eventEmitter')) {
this.add('*eventEmitter', new EventEmitter(this.debugPrint.bind(this)));
}

if (!this.has('*localeManager')) {
this.add('*localeManager', new LocaleManager(this));
}
Expand Down Expand Up @@ -276,9 +277,6 @@
return false;
}
const sharedKey = sharedConfigKey(/** @type {keyof import('../types').ConfigType} */ (key));
if (!this.has(sharedKey)) {
this.add(sharedKey, initialConfig[/** @type {keyof import('../types').ConfigType} */ (key)]);
}
this.$[sharedKey] = value;
return true;
},
Expand All @@ -287,10 +285,6 @@
* @param {keyof import('../types').ConfigType} key
*/
get: (obj, key) => {
const sharedKey = sharedConfigKey(key);
if (!this.has(sharedKey)) {
this.add(sharedKey, initialConfig[key]);
}
return this.$[sharedConfigKey(key)];
},
});
Expand All @@ -304,11 +298,7 @@
* @param {(value: import('../types').ConfigType[T]) => void} callback
*/
subConfigValue(key, callback) {
const sharedKey = sharedConfigKey(key);
if (!this.has(sharedKey)) {
this.add(sharedKey, initialConfig[key]);
}
this.sub(sharedKey, callback);
this.sub(sharedConfigKey(key), callback);
}

/** @param {unknown[]} args */
Expand Down
16 changes: 2 additions & 14 deletions blocks/FileItem/FileItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,18 +150,8 @@ export class FileItem extends UploaderBlock {
return;
}

if (entry.getValue('file')?.type.includes('image')) {
try {
let thumbUrl = await generateThumb(entry.getValue('file'), this.cfg.thumbSize);
entry.setValue('thumbUrl', thumbUrl);
} catch (err) {
let color = window.getComputedStyle(this).getPropertyValue('--clr-generic-file-icon');
entry.setValue('thumbUrl', fileCssBg(color));
}
} else {
let color = window.getComputedStyle(this).getPropertyValue('--clr-generic-file-icon');
entry.setValue('thumbUrl', fileCssBg(color));
}
let color = window.getComputedStyle(this).getPropertyValue('--clr-generic-file-icon');
entry.setValue('thumbUrl', fileCssBg(color));
}

/**
Expand Down Expand Up @@ -310,8 +300,6 @@ export class FileItem extends UploaderBlock {

/** @private */
this._observer = new window.IntersectionObserver(this._observerCallback.bind(this), {
root: this.parentElement,
rootMargin: '50% 0px 50% 0px',
threshold: [0, 1],
});
this._observer.observe(this);
Expand Down
14 changes: 11 additions & 3 deletions blocks/FileItem/file-item.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
lr-file-item {
display: block;
content-visibility: auto;

/* TODO: extract to theme */
height: 56px;
contain-intrinsic-size: auto 56px;
}

lr-file-item:last-of-type {
height: 52px;
contain-intrinsic-size: auto 52px;
}

lr-file-item > .inner {
position: relative;
display: grid;
Expand All @@ -13,7 +24,6 @@ lr-file-item > .inner {
font-size: 0.95em;
background-color: var(--clr-background);
border-radius: var(--border-radius-element);
transition: var(--transition-duration);
}

lr-file-item:last-of-type > .inner {
Expand Down Expand Up @@ -53,7 +63,6 @@ lr-file-item .file-name-wrapper {
padding-left: var(--gap-mid);
overflow: hidden;
color: var(--clr-txt-light);
transition: color var(--transition-duration);
}

lr-file-item .file-name {
Expand Down Expand Up @@ -94,7 +103,6 @@ lr-file-item .badge {
border-radius: 50%;
transform: scale(0.3);
opacity: 0;
transition: var(--transition-duration) ease;
display: flex;
justify-content: center;
align-items: center;
Expand Down
Loading