Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 9 deletions packages/core/src/lazy_import.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SetMap from './data_structures/set_map';
import { domReady, getMatchingElementsFrom } from './helpers/dom';
import { ElementObserver } from './observers/element_observer';
import { domReady } from './helpers/dom';
import { SelectorObserver } from './observers/selector_observer';

const lazyElements = new SetMap<string, () => void>();

Expand All @@ -20,7 +20,7 @@ const lazyElements = new SetMap<string, () => void>();
export default function lazyImport(selector: string, callback: () => void) {
lazyElements.add(selector, callback);

const observer = new ElementObserver(document.documentElement, {
new SelectorObserver(document.documentElement, selector, {
elementConnected() {
for (const selector of lazyElements.keys) {
for (const callback of lazyElements.get(selector) || []) {
Expand All @@ -29,10 +29,5 @@ export default function lazyImport(selector: string, callback: () => void) {
}
}
},
getMatchingElements(element) {
return getMatchingElementsFrom(element, selector);
},
});

observer.start();
}).start();
}
2 changes: 1 addition & 1 deletion packages/core/src/observers/attribute_observer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ElementObserver, type ElementObserverDelegate } from './element_observer';

export type AttributeObserverDelegate<T> = {
export type AttributeObserverDelegate<T = Element> = {
elementConnected?: (element: T) => void;
elementDisconnected?: (element: T) => void;
elementAttributeChanged?: (element: T, name: string) => void;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/observers/element_observer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export type ElementObserverDelegate<T> = {
export type ElementObserverDelegate<T = Element> = {
elementConnected?: (element: T) => void;
elementDisconnected?: (element: T) => void;
elementAttributeChanged?: (element: T, name: string) => void;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/observers/selector_observer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { getMatchingElementsFrom } from '../helpers/dom';
import { ElementObserver } from './element_observer';
import { type ElementObserverDelegate } from './element_observer';

export type SelectorObserverDelegate<T> = {
export type SelectorObserverDelegate<T = Element> = {
elementConnected?: (element: T) => void;
elementDisconnected?: (element: T) => void;
};
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/observers/token_list_observer.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SetMap from '../data_structures/set_map';
import { AttributeObserver, type AttributeObserverDelegate } from './attribute_observer';

export type TokenListObserverDelegate<T> = {
export type TokenListObserverDelegate<T = Element> = {
tokenMatched?: (token: Token<T>) => void;
tokenUnmatched?: (token: Token<T>) => void;
};
Expand Down